shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,491 Commits 5 Branches 0 Tags
d720adf672e2ea5fe84a8ebe0f1bf433aaab3edb
Commit Graph

5359 Commits

Author SHA1 Message Date
deathride58
d720adf672 Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895 
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
 2018-03-05 03:16:48 +00:00
deathride58
8c7d0b2d5d Merge pull request #5799 from Citadel-Station-13/upstream-merge-36019 
[MIRROR] Fixes tinfoil hats and lengthens the time for someone else to put it on
 2018-03-05 02:46:25 +00:00
deathride58
fc4612fe93 Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071 
[MIRROR] Advanced roasting sticks, for cooking sausages
 2018-03-05 02:45:33 +00:00
deathride58
5f742c446e Merge pull request #5796 from Citadel-Station-13/upstream-merge-36108 
[MIRROR] better addresses the gas miner active turf issue
 2018-03-05 02:44:49 +00:00
deathride58
aac73b7880 Merge pull request #5794 from Citadel-Station-13/upstream-merge-36001 
[MIRROR] Removes 'release all' buttons from ORM
 2018-03-05 02:44:10 +00:00
Potato-Masher
923934d623 Fixes Guardian Spirits not being able to move in stopped time along with their user. (#35895) 
* I have no idea if this will work, but hopefully makes stands immune to timestops if their master is.

* That looks better

* Maybe that will work, maybe it will not.

* Checks if the summoner actually exists.

As per review advice from @DaedalusGame.
 2018-03-04 17:11:47 -06:00
Dax Dupont
df5cbc448e Fixes tinfoil hats and lengthens the time for someone else to put it on (#36019) 
* Fixes tinfoil hats and lenghtens the time for someone else to put it on

* Adds some flavor to that text
 2018-03-04 16:06:14 -06:00
vuonojenmustaturska
e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
Jordan Brown
caa59d936f Merge pull request #36108 from tgstation/duncathan-patch-1 
better addresses the gas miner active turf issue
 2018-03-04 15:39:08 -06:00
RandomMarine
db98a60274 Removes 'release all' buttons from ORM 2018-03-04 15:26:26 -06:00
kevinz000
28e91caec3 World time stat mc panel (#36111) 2018-03-04 14:54:01 -06:00
CitadelStationBot
d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762) 
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
 2018-03-04 13:06:42 -06:00
Poojawa
61b121a4c9 Dogborg fixes, Borg construction animations! (#5725) 
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
 2018-03-04 11:53:48 -06:00
CitadelStationBot
12829e5cad [MIRROR] Little changes and standardisation of some admin commands (#5781) 
* Little changes and standardisation of some admin commands

* Update randomverbs.dm

* Update randomverbs.dm

* tab boi
 2018-03-04 09:39:41 -06:00
CitadelStationBot
69405b9561 [MIRROR] Allows admins to easily spawn cargo crates (#5786) 
* makes cargo spawning easy (#36094)

* Allows admins to easily spawn cargo crates
 2018-03-04 07:45:18 -06:00
CitadelStationBot
7cdeebab69 [MIRROR] Blindfolds properly apply blindness (#5782) 
* Blindfolds properly apply blindness (#36101)

* blindfolds properly apply blindness

* covering your eyes now applies blindness

* Blindfolds properly apply blindness
 2018-03-04 05:26:37 -06:00
CitadelStationBot
d446d0ed6d [MIRROR] Admin combohud verb (#5785) 
* Admin combohud verb (#36096)

* combohuds

* Update randomverbs.dm

* Admin combohud verb
 2018-03-04 05:26:22 -06:00
CitadelStationBot
3be4e3ffba [MIRROR] Makes weak alcohol not kill you (#5783) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* Makes weak alcohol not kill you
 2018-03-04 05:26:04 -06:00
LetterJay
c7448713ae Merge pull request #5775 from Citadel-Station-13/upstream-merge-36066 
[MIRROR]  Allows you to easily replace tanks in canisters & pumps
 2018-03-04 00:37:15 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00
Poojawa
b98fb70da8 Fixes Tesla Coil Circuits and contruction 2018-03-03 22:28:55 -06:00
LetterJay
567bb359ef Merge pull request #5751 from Citadel-Station-13/upstream-merge-35968 
[MIRROR] Makes machines constructable either anchored or unanchored
 2018-03-03 15:06:37 -06:00
ShizCalev
d7409f92c0 Easy tanks in canister replacement (#36066) 2018-03-03 03:42:08 -06:00
LetterJay
d4b3ea1a49 Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059 
[MIRROR] Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 02:45:57 -06:00
LetterJay
4162e8a144 Merge pull request #5767 from Citadel-Station-13/upstream-merge-36063 
[MIRROR] Meth is not good for your brain
 2018-03-03 02:45:43 -06:00
LetterJay
05b2492f81 Merge pull request #5765 from Citadel-Station-13/upstream-merge-36062 
[MIRROR] White crayons no longer make gloves look latex
 2018-03-03 02:45:13 -06:00
CitadelStationBot
c168c1582e [MIRROR] Speed up space wind by avoiding noop proc calls. (#5763) 
* Speed up space wind by avoiding noop proc calls. (#36072)

During times of high numbers of active turfs on station, this proc tends to cost more per turf then process_cell does, avoiding noops is really the only easy speed up opportunity i can see here unless i wanted to make a flag for rather or not experience_pressure_difference is called so only movables that override the default behavior (livings really) get the proc called on them

* Speed up space wind by avoiding noop proc calls.
 2018-03-03 02:32:45 -06:00
Jordie
19b24c40a8 Merge pull request #36059 from ShizCalev/cuba_libre 
Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 00:11:56 -06:00
Jordie
ddc3d5223c Merge pull request #36063 from Robustin/Methisbadmmmkay 
Meth is not good for your brain
 2018-03-03 00:11:45 -06:00
cebutris
67bd3b3d7e White crayons no longer make gloves look latex (#36062) 
* makes white crayons make white gloves, not latex

* mime subtype gloves

* Why didn't cobby think of this?

* makes mime crayons give latex gloves
 2018-03-03 00:03:16 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
deathride58
b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
deathride58
fce0352d56 Update admin.dm 2018-03-02 21:38:20 -05:00
deathride58
143909a855 Update examine.dm 2018-03-02 21:32:07 -05:00
deathride58
272d0e1caf Update preferences_savefile.dm 2018-03-02 21:30:58 -05:00
deathride58
616269a8f1 Update preferences_savefile.dm 2018-03-02 21:30:14 -05:00
deathride58
797a35e5ad Update preferences_savefile.dm 2018-03-02 21:29:45 -05:00
deathride58
0b4cdc2e69 Update preferences.dm 2018-03-02 21:28:33 -05:00
CitadelStationBot
fdd6b01354 [MIRROR] Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#5757) 
* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#35853)

* Update all_nodes.dm

* Lowers lasers to 3K from 5K

* 10K -> 7.5K

* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK)
 2018-03-02 20:08:04 -06:00
CitadelStationBot
75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758) 
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
 2018-03-02 20:07:39 -06:00
CitadelStationBot
b198e943e9 [MIRROR] Rearranges cargo packs (#5750) 
* Rearranges cargo packs

* update packs.dm
 2018-03-02 20:06:35 -06:00
CitadelStationBot
59d61d5e0d [MIRROR] [READY]Circuit balance (#5760) 
* [READY]Circuit balance

* [READY]Circuit balance (#35931)

* cooldowns, power cell,disks

* NUMBERS NUMBERS NUMBERS

* 1 8 9

* PR PR PR

* DESC DESCDSCDCC

* <br>

* GET ALL CONTENTS

* Update power.dm

* Update power.dm

* Update time.dm
 2018-03-02 20:05:28 -06:00
CitadelStationBot
42fa773aaf [MIRROR] Fixes backup light rounding (#5759) 
* Fixes backup light rounding - #36060

* Fixes backup light rounding
 2018-03-02 18:42:19 -06:00
CitadelStationBot
1437fb4bd4 [MIRROR] Fixes SCP-294 overlay problems (#5746) 
* Fixes SCP-294 overlay problems

* recompiles tgui
 2018-03-02 18:34:45 -06:00
CitadelStationBot
17b48041a7 [MIRROR] Fixes NTNet scanner component (#5743) 
* Fixes NTNet scanner component (#36036)

* Fixes NTNet scanner component
 2018-03-02 18:32:47 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
BordListian
07270c198f Makes machines constructable either anchored or unanchored (#35968) 
* - Makes machines constructable either anchored or unanchored if the board allows it

* - Tesla Coils connect to the network if anchored
 2018-03-02 14:38:02 -06:00
Poojawa
3690cf3309 Oops 2018-03-01 09:39:28 -06:00
CitadelStationBot
bbc261952e [MIRROR] Medals now show the commendation text in the description. (#5733) 
* Medals now show the commendation text in the description. (#36020)

* Medals now show the commendation text in the description

* the user is now real

* Medals now show the commendation text in the description.
 2018-02-28 19:42:03 -06:00