shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,483 Commits 5 Branches 0 Tags
ca4c2da24808bd7ea3dde32435dbbe67ca24cb08
Commit Graph

4373 Commits

Author SHA1 Message Date
deathride58
ca4c2da248 Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074 
[MIRROR] Updates test areas debug command
 2018-01-08 20:04:28 +00:00
ShizCalev
f54854bca8 Updates test areas debug command (#34074) 
* Sanity check for test areas debug command

* Shifted to popup window
 2018-01-08 04:39:09 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
e39ae49a2e !!experimental!! fix for flavortext readmore 2018-01-08 01:15:40 -05:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
deathride58
c2eed848dd Merge pull request #4696 from Citadel-Station-13/upstream-merge-34150 
[MIRROR] Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
 2018-01-08 04:42:28 +00:00
deathride58
406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076 
[MIRROR] Fixes diagonal movement in pipes
 2018-01-08 04:18:06 +00:00
deathride58
432fdfc0d3 Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097 
[MIRROR] Fixes can_cast short circuit
 2018-01-08 04:17:42 +00:00
deathride58
c0d2fe8817 Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979 
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
 2018-01-08 04:16:38 +00:00
deathride58
91531525ca Merge pull request #4706 from Citadel-Station-13/upstream-merge-33971 
[MIRROR] Newly crafted stacks are merged with held stacks of the same type
 2018-01-08 04:16:01 +00:00
deathride58
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
deathride58
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
deathride58
94b664f934 Update ridden.dm 2018-01-07 23:10:44 -05:00
Jordan Brown
af27a1aa03 Fixes can_cast short circuit (#34097) 2018-01-07 20:49:50 -06:00
Emmett Gaines
65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
Iamgoofball
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 Ginnane
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
Jordan Brown
f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem 
Adds package wrapping to autolathes
 2018-01-07 20:07:00 -06:00
Jordan Brown
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 Brown
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
kevinz000
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
deathride58
bc00ba540a Merge branch 'master' into mapsyncs43293845982 2018-01-07 22:06:04 +00:00
deathride58
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
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58
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
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
deathride58
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
deathride58
7f53f7dc08 Update projectile.dm 2018-01-07 15:20:59 -05:00
deathride58
dd5dc57043 Update blood.dm 2018-01-07 15:20:11 -05:00
Leo
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
Leo
be1fe799db Fixes armor penetration not working on objects and therefore mechs 2018-01-07 11:03:59 -06:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
modularized_suicide
f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
LetterJay
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
Jordie
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
Leo
fdfa61c1c8 Merge pull request #34107 from ShizCalev/canister-sprite 
Fixes relabeled canisters reverting sprites when broken
 2018-01-06 08:51:32 -06:00
deathride58
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
deathride58
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
deathride58
e0ff75a870 Merge pull request #4673 from Citadel-Station-13/upstream-merge-34077 
[MIRROR] Fix incorrect method variable description in throw_impact
 2018-01-05 22:13:19 +00:00
deathride58
6af2abfa0e Merge pull request #4674 from Citadel-Station-13/upstream-merge-34084 
[MIRROR] Reduce away mission load time drastically
 2018-01-05 22:12:44 +00:00
Shadowlight213
e20cbe5aa7 Fixes infernal jaunt causing devils to get stuck if interrupted (#34056) 
* Fixes infernal jaunt causing devils to get stuck if stunned.

* defines because I know a maintainer will yell at me for this.
 2018-01-05 06:05:16 -06:00
Tad Hardesty
a55d2e7ff7 Show the correct coordinates when a pulse rifle prize is found (#34089) 2018-01-05 06:03:05 -06:00
Tad Hardesty
81cdedea5d Fix away missions taking 2+ minutes to load (#34084) 2018-01-05 06:01:52 -06:00
oranges
6012a5c6eb Fix bug with smashing bottles on throw (#34077) 
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
 2018-01-05 06:01:44 -06:00
Cruix
015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
ShizCalev
3d3f28e091 Fixes white power cables in DM (#34066) 2018-01-04 20:16:31 -06:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58
1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58
39016e36b2 fixing compiling errors one at a time 2018-01-04 02:37:02 -05:00