shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,725 Commits 5 Branches 0 Tags
1d729e7d6dd8f2185d0b46d4d76dd3dc25075889
Commit Graph
7772 Commits
Author SHA1 Message Date
deathride58andGitHub d11604e502 Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129 
[MIRROR] Adds package wrapping to autolathes
 2018-01-08 04:14:52 +00:00
deathride58andGitHub da3d982ed6 Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118 
[MIRROR] Reduces the memory footprint of the gas_mixture datum
 2018-01-08 04:14:22 +00:00
deathride58andGitHub b18d720730 Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119 
[MIRROR] Fixes uplink_purchase_log GC error
 2018-01-08 04:14:04 +00:00
deathride58andGitHub d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157 
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
 2018-01-08 04:13:47 +00:00
deathride58andGitHub 94b664f934 Update ridden.dm 2018-01-07 23:10:44 -05:00
kevinz000andCitadelStationBot cbe0a9a05d Fixes component forensics deleting old instead of new component. (#34058) 
* component dupe unique

* sorry I was using webeditor on phone and it wouldn't let me tab
 2018-01-07 21:50:23 -06:00
Dax DupontandCitadelStationBot d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
orangesandCitadelStationBot 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
MoreRobustThanYouandCitadelStationBot 02b63e199b Adds spaceturf check to blob overmind spawning 2018-01-07 20:52:01 -06:00
Jordan BrownandCitadelStationBot af27a1aa03 Fixes can_cast short circuit (#34097) 2018-01-07 20:49:50 -06:00
TlaltecuhtliandCitadelStationBot 7aa8bf9b69 fixes some grinder recipes (#34093) 
* commit

help what is this

* ddd

* sdsadsda

* fegdhfd

* ddddddddddddddd
 2018-01-07 20:36:29 -06:00
Emmett GainesandCitadelStationBot 65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
Jordan BrownandCitadelStationBot 065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
IamgoofballandCitadelStationBot 99b299a1eb Implements the Ballmer Peak: Now the bartender can help R&D! (#33979) 
* Implements the Ballmer Peak: Now the bartender can help R&D!

* fugg

* lmao forgot to multiply that

* unzips math

* asdaafffff

* buffs windows ME

* Adds notifications about the peak.
 2018-01-07 20:30:57 -06:00
John GinnaneandCitadelStationBot 6720fc3713 Newly crafted stacks are merged with held stacks of the same type (#33971) 
* Merge newly crafted stacks with held stacks

* Update code
 2018-01-07 20:28:46 -06:00
Ashe HiggsandCitadelStationBot c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
Jordan BrownandCitadelStationBot bc636ddb2c Merge pull request #34128 from ShizCalev/safe-dial 
Removes the safe dial multiplier
 2018-01-07 20:08:11 -06:00
Jordan BrownandCitadelStationBot f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem 
Adds package wrapping to autolathes
 2018-01-07 20:07:00 -06:00
Jordan BrownandCitadelStationBot 1e4a6dd26b Merge pull request #34118 from MrStonedOne/patch-459 
Reduces the memory footprint of the gas_mixture datum
 2018-01-07 19:58:35 -06:00
Jordan BrownandCitadelStationBot 1e2e8b7ecb Fixes uplink_purchase_log GC error (#34119) 
* Fixes uplink_purchase_log GC error

* Add missing GLOB.
 2018-01-07 18:52:26 -06:00
kevinz000andCitadelStationBot ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157) 
* Fixes dchat broadcast

* Update communications.dm
 2018-01-07 18:51:16 -06:00
Jordan BrownandCitadelStationBot 801eab4c3c Fixes decals being created on bad turfs (#34121) 
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
 2018-01-07 18:51:09 -06:00
kevinz000andCitadelStationBot 604712db33 Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire 2018-01-07 18:49:49 -06:00
deathride58andGitHub bc00ba540a Merge branch 'master' into mapsyncs43293845982 2018-01-07 22:06:04 +00:00
deathride58andGitHub 1944c08a7b Merge pull request #4692 from Citadel-Station-13/upstream-merge-34140 
[MIRROR] Fixes armor penetration not working on objects and therefore mechs
 2018-01-07 20:39:29 +00:00
deathride58andGitHub 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58andGitHub 57d79640f4 Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134 
[MIRROR] Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
 2018-01-07 20:30:06 +00:00
deathride58 3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
deathride58andGitHub cc0cb03046 Merge pull request #4693 from Citadel-Station-13/upstream-merge-34127 
[MIRROR] Removes the weird timer shennaigans from exp tracking
 2018-01-07 20:21:47 +00:00
deathride58andGitHub 7f19b55888 Merge pull request #4689 from Citadel-Station-13/upstream-merge-34131 
[MIRROR] Fixes sunglasses' incorrect description
 2018-01-07 20:21:31 +00:00
deathride58andGitHub 7f53f7dc08 Update projectile.dm 2018-01-07 15:20:59 -05:00
deathride58andGitHub dd5dc57043 Update blood.dm 2018-01-07 15:20:11 -05:00
deathride58 ca058b1266 reverts rolling bucket timer subsystem 2018-01-07 15:15:21 -05:00
LeoandCitadelStationBot d5a54402cf Merge pull request #34127 from tgstation/Cyberboss-patch-7 
Removes the weird timer shennaigans from exp tracking
 2018-01-07 11:06:14 -06:00
LeoandCitadelStationBot be1fe799db Fixes armor penetration not working on objects and therefore mechs 2018-01-07 11:03:59 -06:00
ShizCalevandCitadelStationBot 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
modularized_suicideandCitadelStationBot c2851e7837 priority:critical 2018-01-07 02:08:51 -06:00
modularized_suicideandCitadelStationBot f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
deathride58andGitHub 277320b126 Merge pull request #4685 from Citadel-Station-13/upstream-merge-34114 
[MIRROR] Fixes some antags missing from roundend report
 2018-01-06 20:30:02 +00:00
LetterJayandGitHub 8c448b0d52 Merge pull request #4686 from Citadel-Station-13/upstream-merge-34116 
[MIRROR] Adds ban option for team antags
 2018-01-06 10:23:17 -06:00
LetterJayandGitHub f36b07371f Update datum_traitor.dm 2018-01-06 10:23:08 -06:00
JordieandCitadelStationBot 8f8e16ba12 Adds ban option for team antags (#34116) 
* adds ban option for team antags

* conversion antags ban button
 2018-01-06 08:52:31 -06:00
AnturKandCitadelStationBot 0638dabfd2 Fixes some antags missing from roundend report 2018-01-06 08:51:51 -06:00
LeoandCitadelStationBot fdfa61c1c8 Merge pull request #34107 from ShizCalev/canister-sprite 
Fixes relabeled canisters reverting sprites when broken
 2018-01-06 08:51:32 -06:00
deathride58andGitHub 29047804e2 Merge pull request #4680 from Citadel-Station-13/upstream-merge-32733 
[MIRROR] [512] Disallow cross-Z examination and manipulation
 2018-01-06 01:56:24 +00:00
deathride58andGitHub bd160e46d9 Update adjacent.dm 2018-01-05 17:25:41 -05:00
deathride58andGitHub 01582ce0b7 Merge pull request #4676 from Citadel-Station-13/upstream-merge-34056 
[MIRROR]  Fixes infernal jaunt causing devils to get stuck if interrupted
 2018-01-05 22:17:28 +00:00
deathride58andGitHub ebf3863195 Merge pull request #4681 from Citadel-Station-13/upstream-merge-34034 
[MIRROR] Makes crayons draw at the location you click
 2018-01-05 22:16:53 +00:00
deathride58andGitHub 6f720a2010 Merge pull request #4672 from Citadel-Station-13/upstream-merge-34083 
[MIRROR] Removed some superfluous stack code
 2018-01-05 22:16:16 +00:00