Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cyberboss vs LICENSE round 27 #33174

Merged
merged 2 commits into from Dec 1, 2017
Merged

Cyberboss vs LICENSE round 27 #33174

merged 2 commits into from Dec 1, 2017

Conversation

Cyberboss
Copy link
Member

If this doesn't work, I concede

@praisenarsie
Copy link
Contributor

@nicbn
Copy link
Contributor

nicbn commented Nov 29, 2017

Maybe you should name it OLD_LICENSE-GPLv3 without the txt extension?

@Cyberboss
Copy link
Member Author

The problem is "LICENSE" in the title judging by my convo with GitHub support

@CPTANT
Copy link
Contributor

CPTANT commented Dec 1, 2017

What problem does this solve?

@Cyberboss
Copy link
Member Author

I'm trying to get github's license detector working on the repository

@AnturK AnturK merged commit 710f334 into master Dec 1, 2017
Partheo pushed a commit to outer-haven/outer-haven that referenced this pull request Dec 1, 2017
* Cyberboss vs LICENSE round 27

* Update license name in README.md
@Cyberboss Cyberboss deleted the Cyberboss-patch-2 branch December 2, 2017 15:43
nyudenkov pushed a commit to animusdev/whiteTG that referenced this pull request Dec 12, 2017
* Moves pipe meter sprites (tgstation#33122)

* Removes some unused sprite files (tgstation#33121)

* Removes two unused sprite files

* Removes two more sprites

* Removes "machine prototypes" (tgstation#33134)

* Automatic changelog generation for PR tgstation#33134 [ci skip]

* Fix manually-given download objective description (tgstation#33133)

* Automatic changelog generation for PR tgstation#33133 [ci skip]

* Automatic changelog compile, [ci skip]

* Removes mass-spectrometers (tgstation#32965)

* Automatic changelog generation for PR tgstation#32965 [ci skip]

* Fixes VV Make Space Ninja verb (tgstation#32982)

* Automatic changelog generation for PR tgstation#32982 [ci skip]

* Automatic changelog compile, [ci skip]

* Fix name on Mech LMG tech node (tgstation#33135)

* Automatic changelog generation for PR tgstation#33135 [ci skip]

* Fixes big band music crate (tgstation#33138)

* Makes the sloth an actual sloth (tgstation#33131)

glide_size change lowers their tile glide rate to be slow as well.

* Automatic changelog generation for PR tgstation#33131 [ci skip]

* Fixes twohanded weapons showing outdated icons (tgstation#33127)

* Update artefact.dm (tgstation#33129)

Beep Beep more hard to get suicides are fun!

* Enhance R&D Console UI in various ways

The header has been made tighter, shows current research production, and
doesn't show disk status. Researchable technologies in the overview show
their point cost. Tech summaries are tighter, and unlocked designs are
represented visually with tooltips.

* Improve the techweb design view

The technologies which unlock the design are shown. Lathe types are
shown visually. If the design is constructible, a button to go to the
lathe search screen is shown.

* Show past, current, and future techs in columns

* Cache tiers rather than recalculating them constantly

* Show prereqs and unlocks as columns in the node view

* Update departmental lathes to match the R&D console

* Cache design datum icons for sanic speed

* Avoid string concatenation when building the lathe list

* Fix and tidy the output of research scanner goggles

* Overhaul and fix destructive analyzer menu

* Ore Stacking (tgstation#33062)

* Revert "Ore Stacking (tgstation#33062)"

This reverts commit 8e1ac57.

* Automatic changelog compile, [ci skip]

* Fix for applying collars to pets that don't have relevant icon.  (tgstation#33156)

* Trying to fix git

* Performed cleanup as requested.

Tested, still working as intended.

* Adds survival knifes to nukeop gear and ability to mount bayonets on few weapons, new bayonet sprites. (tgstation#33071)

* cleans up the README

* Nuke Op Datumization (tgstation#32680)

* Nuke Op datumization.

* Whoops

* Fixes use_tag for nukes. Only syndiebomb uses one.

* Fixing rebase stuff

* How many times

* Cleanup

* You know what let's go with minimal change.

* Removes the mob mouse from maintenance from maps

* cardboard no longer can damage you

* Remove unnecessary argument to Join

* Fix turbine showing broken (tgstation#33144)

* Automatic changelog generation for PR tgstation#33144 [ci skip]

* sm soundtweak (tgstation#33154)

* Automatic changelog generation for PR tgstation#33154 [ci skip]

* Fixes deltastation's cargo area not having an area(?)

* Do this (tgstation#33149)

* nice removal (tgstation#33167)

* Automatic changelog compile, [ci skip]

* In-code key handling system

* runtime fix

* let's swap it here instead

* Flash burns out AFTER flashing

* Moderate Damage Examination (tgstation#33008)

Ok so the last one only worked on carbons who weren't humans, woops. See: tgstation#32707

🆑 Robustin
tweak: Damage examinations now include a "moderate" classification. Before minor was <30 and severe was anything 30 or above. Now minor is <25, moderate is 25 to <50, and severe is 50+.
/🆑

* Automatic changelog generation for PR tgstation#33008 [ci skip]

* Gives HoS a lathe board

* Cyberboss vs LICENSE round 27 (tgstation#33174)

* Cyberboss vs LICENSE round 27

* Update license name in README.md

* new cult construct shell sprite (tgstation#33171)

* Automatic changelog generation for PR tgstation#33171 [ci skip]

* Ratvar will now bitchslap BOH babies (tgstation#33159)

* Singuloproofing Reebe

* Message reformatted

* Inconsistent Indentification

* user is now living so we can knock them down

* Automatic changelog generation for PR tgstation#33159 [ci skip]

* Bitflag returns from component signals (tgstation#33186)

* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup

* Automatic changelog generation for PR tgstation#33151 [ci skip]

* Fixes spelling error in opened cryogenic pods. (tgstation#33189)

* Automatic changelog generation for PR tgstation#33189 [ci skip]

* Clean up some loc assignments (tgstation#33157)

* Automatic changelog generation for PR tgstation#33157 [ci skip]

* Fixes syndieborg spawner

* Plushie relationships! (tgstation#33184)

* Kor and Bubblegum, sitting in a tree

* complying with oranges' review

* remove the, moves mood setting to make_young, dots Ts, crosses eyes

* Automatic changelog generation for PR tgstation#33184 [ci skip]

* Makes ahelp timestamps consistent with logs

* Prevents the PA wires from being EMP'd (tgstation#33199)

* returns emp_act

* jordie for code owner

* Automatic changelog generation for PR tgstation#33199 [ci skip]

* Automatic changelog generation for PR tgstation#33192 [ci skip]

* Automatic changelog compile, [ci skip]

* Revolutionaries can now see deconversion message regardless of status (tgstation#33202)

* Measure energy values in joules

* Xenobio Blueprints Change

* Adds a CRASH on invalid calls to record_feedback

* Spellcheck (tgstation#33214)

* Automatic changelog generation for PR tgstation#33214 [ci skip]

* Crash to timers and INFINITY check to beams. (tgstation#33219)

* beams

* timers

* >= instead of !=

* whooops

* Adds emergency lights, built into light fixtures (tgstation#33213)

* Adds emergency lighting

* Checks for the cell during construction

* Adds AI/APC control of emergency lights

* Malfunction ability

* get_area(src)

* Loop checking, processing to come when clarified

* that DOES remind me to do this!

* Automatic changelog generation for PR tgstation#33213 [ci skip]

* Datumizes saymodes (tgstation#33013)

* Datumized saymodes!

* Update living.dm

* ...

* Automatic changelog compile, [ci skip]

* Plasma statues get fixed (tgstation#33224)

* Plasma statues fix

* Actually a fix

* brackets

* Automatic changelog generation for PR tgstation#33224 [ci skip]

* Being buckled to a bed now saves you from "the floor is lava" (tgstation#33204)

* Update floor_is_lava.dm

* Switcheroo

* )))))))))))))

* Automatic changelog generation for PR tgstation#33204 [ci skip]

* Excludes ___TGS3TempBranch from builds

* refactors riding datums to a component, vehicle refactor staging for mech overhaul (tgstation#32249)

* Reduces the volume of showers

* Automatic changelog compile, [ci skip]

* People jitter when revived by defibs

* Fixes missing eyes being absent (tgstation#33203)

* IC fixes (tgstation#33215)

* Mechs now require fuel to repair (tgstation#33225)

* Automatic changelog generation for PR tgstation#33225 [ci skip]

* Fixes lighting update recursion (tgstation#33258)

* Automatic changelog compile, [ci skip]

* Fix uplink implants not working

* Holorecord disks. (tgstation#32868)

* Holorecord disks.

* visual preset swap command

* Renaming command

* Holodisk sprite by WJohn

* Adds holodisks to autolathe

* Cleanup

* Needless if

* Automatic changelog generation for PR tgstation#32868 [ci skip]

* Adds quiet argument to playsound. (tgstation#33185)

* Adds quiet argument to playsound.

* argument name change

* SendSignal optimization (tgstation#33220)

* SendSignal optimization

* Update component README

* Readd required null checks

* Moves some machine sprites into /machines/ folder (tgstation#33124)

* Moves biogenerator.dmi

* Separates cryogenic2.dmi into 3 sprite files

* Updates a map

* moves suit storage sprite

* Gives cameras their own file

* Speeds up some list helpers

* Why has no one done this yet??

* Move up the lazy macros

* Fixes departmental say

* Allows read-only VV of feedback

* Revert "Why has no one done this yet??"

This reverts commit e4e7ba3.

I don't know how this got here...

* Fixes robeless apprentice

* Automatic changelog compile, [ci skip]

* Emphasises the importance of round ID in issue template

* Automatic changelog generation for PR tgstation#33251 [ci skip]

* Adds server tools version to feedback (tgstation#33244)

* Adds server tools version to feedback

* Fix incorrect call to record_feedback

* Add number to record feedback calls

* Automatic changelog generation for PR tgstation#32964 [ci skip]

* Automatic changelog compile, [ci skip]

* [Metastation] Easel in Quiet Room moved to art storage (tgstation#33240)

That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.

* Stethoscope defibrillation checking (tgstation#33234)

* Automatic changelog generation for PR tgstation#33234 [ci skip]

* Adds disco inferno shuttle. (tgstation#33230)

* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.

* Automatic changelog generation for PR tgstation#33230 [ci skip]

* Fixes powernets (tgstation#33288)

* removes some code i forgot about (tgstation#33260)

* Automatic changelog generation for PR tgstation#32751 [ci skip]

* Fixes say logging

* Automatic changelog compile, [ci skip]

* Fixes ghost role events being picked by false alert

* [s] Fix changeling chat (tgstation#33305)

* Fix changeling chat

* Update say.dm

* Fixes ahelp trimming (tgstation#33268)

* [Metastation] Removes window on ORM and the spare ORM (tgstation#33200)

* [Metastation] Removes window spawner on cargo ORM

There was a window spawner on the ORM. It's gone now.

* Never mind, there's just not supposed to be an ORM there

* Revert "Never mind, there's just not supposed to be an ORM there"

This reverts commit 778f613.

* Removes the spare ORM

* Fixes every config flag updating world.sleep_offline

* Blank messages no longer add a second input box, after you close the
first

* old turf in afterShuttleMove

* Fix some unquoted list associations (tgstation#33290)

* Automatic changelog generation for PR tgstation#33262 [ci skip]

* Reverts sound range and falloff  so as to not carry as far (tgstation#33259)

* Reverts triple sound range

* Reverts sound falloff

* Automatic changelog generation for PR tgstation#33259 [ci skip]

* Removes ComponentActivated in favor of callbacks (tgstation#33274)

* Removes ComponentActivated

* Removes a bit of proc call overhead

* Fix callback definition

* Removes bad comment. Makes check saner (tgstation#33270)

* Minor component optimizations (tgstation#33269)

* Minor component optimizations

* Second argument of list.Copy is optional

* Omegastation Fixes (tgstation#33249)

*  Good Clean Fun: A vending machine for games! (tgstation#33265)

* Good Clean Fun: A vending machine for games!

:cl: coiax
add: Quiet areas of libraries on station have now been equipped with a
vending machine containing suitable recreational activities.
/:cl:

- Sprite by WJohn
- Removes dice bags and cards from the tables of libraries, you can now
get them from the vendor.
- If we ever implement checkers or go or chess, we should add the
playing kits to the vendor.

* Add sprites, and it compiles

* Map modifications

* Moves defines to end of file

* Automatic changelog generation for PR tgstation#33265 [ci skip]

* Automatic changelog compile, [ci skip]

* [Metastation] Moves drone dispenser to Robotics maint (tgstation#33267)

:cl: coiax
add: The drone dispenser on Metastation has been moved to the
maintenance by Robotics.
/:cl:

This puts in line with other maps where the drone dispenser is in
maintenance/science department, rather than on Metastation where it's in
the command only museum.

* Automatic changelog generation for PR tgstation#33267 [ci skip]

* Fix vending machines nullspacing every item on init

* Adds support for non-1:1 screen ratios (Doesn't add widescreen) (tgstation#32950)

* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb

* makes the default view scale a config option

* i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW

* second pass - makes change view range function again

* Fix supermatter tongs icon bug

Fixes tgstation#33161

* Fixes light breaking

* Automatic changelog compile, [ci skip]

* Adds games vendor resupply crate

* Ghost defile removes salt piles (tgstation#33294)

Fixes tgstation#33291

* Automatic changelog generation for PR tgstation#33294 [ci skip]

* Makes sillicon chat more visible (tgstation#33222)

Made it green on black

Forgot to remove it at the bold thingy

* Automatic changelog generation for PR tgstation#33222 [ci skip]

* Fugu improvements (tgstation#33182)

* come on, you know i wumbo you wumbo he she me wumbo

* it's hip to wumbo

* Fix indentation

* Automatic changelog compile, [ci skip]

* Nerfs criticism

* Brain Traumas (tgstation#31727)

* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances

* Automatic changelog generation for PR tgstation#31727 [ci skip]

* Automatic changelog compile, [ci skip]

* Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (tgstation#32935)

* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!

* Automatic changelog generation for PR tgstation#32935 [ci skip]

* fixes ai anticheat runtimes

* panic_address -> panic_server_address

* Automatic changelog generation for PR tgstation#33316 [ci skip]

* Adds Some Stolen goon code that likely has a trojan to make hex2num faster. (tgstation#33330)

* Steals from the goons.

* Update type2type.dm

* var/var/var/var/var/var/var

* Automatic changelog compile, [ci skip]

* Replace radio frequency magic numbers with defines (tgstation#33236)

* Change transmission_method to use defines rather than magic numbers

* Use MIN and MAX_FREE_FREQ defines when bounds-checking radios

* Remove violently broken "Debug Signals" verb

The relevant Destroy() is never called, making the static pointers list
take lots of memory and be large enough, even at roundstart, to crash
the chat when invoked (25k+ entries).

* Remove unnecessary checks for SSradio not existing

* Move department frequencies from GLOB to defines

* Replace all hardcoded radio frequencies with named defines

* Change the radio filters to be defines

* Use a define for the default signaler code

* Automatic changelog generation for PR tgstation#33236 [ci skip]

* Fixes some record_feedback calls (tgstation#33317)

* Fixes protolathe feedback

* Fix circuit imprinter record_feedback

* Fixes destructive analyzer record_feedback

* Automatic changelog compile, [ci skip]

* Revert "Adds Some Stolen goon code that likely has a trojan to make hex2num faster. (tgstation#33330)"

This reverts commit 9aa8a91.

It had a trojan

* [Box] Moves drone dispenser to Robotics maintenance (tgstation#33342)

:cl: coiax
add: The drone dispenser on Box Station has been moved from the Testing
Lab to the Morgue/Robotics maintenance tunnel.
/:cl:

- I added a 2 drop maint loot spawner as well.

* Automatic changelog generation for PR tgstation#33342 [ci skip]

* Automatic changelog generation for PR tgstation#33324 [ci skip]

* Fixes mugs being called "broken bottles"

* Automatic changelog compile, [ci skip]

* tweaks techwebs (tgstation#33082)

* tweaks techwebs

* Removes comment

and cuts aytech price

* Automatic changelog generation for PR tgstation#33082 [ci skip]

* Adds a MapAtmosFixer auto compile thing to .gitignore (tgstation#33336)

* Improves the Smoke Machine sprite (tgstation#33344)

* dab

* here you go WJ

Darkens sprite, adds detail (connector ports/shading)

* Automatic changelog generation for PR tgstation#33344 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes some broken random events (tgstation#33345)

* Automatic changelog generation for PR tgstation#33345 [ci skip]

* commit (tgstation#33343)

help what is this

* Adds a medal for getting to the end of the secret tile dialog. (tgstation#33116)

* Adds medal for reaching the end of the secret room panel list

* fix

* Automatic changelog generation for PR tgstation#33116 [ci skip]

* Automatic changelog generation for PR tgstation#33235 [ci skip]

* Adds pet carriers (tgstation#33231)

* Adds pet carriers

* Some bugfixes

* praise the 1 AM code

* Automatic changelog generation for PR tgstation#33231 [ci skip]

* Makes actionbuttons remember positions where you locked them. (tgstation#33150)

* conjure spells fix

* added newline at end of file

* actionbuttons positioning memory

* remade id generation

* added memory reset on mass reset

* small fix

* Automatic changelog generation for PR tgstation#33150 [ci skip]

* Limit bullet overlays on walls (tgstation#33364)

* Limit bullet overlays on walls

* Whitespace bad

* Okay

* Touching this because I'm testing TGS3 stuff

* Update walls.dm

* Removes juicers (tgstation#33361)

* Removes juicer

* Of course there's THAT ONE MAP

* New IC manipulator sprites (tgstation#33360)

* Allows rdconsoles to link to departmental things. (tgstation#33195)

* hopefully optimizes process_cell() a touch (tgstation#33329)

* hopeful optimizations + code cleanup to process_cell() and lindaturftile

* minor fixes

* break and right paren

* extraneous define

* Fixes observer versions of sillicon chat (tgstation#33355)

* Automatic changelog generation for PR tgstation#33355 [ci skip]

* Fixes air alarm gas thresholds being impossible to change (tgstation#33359)

* Fixes random in random seeds (tgstation#33362)

* Fixes random in random seeds

* removed kwargs

* R&D fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants