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

4349 Commits

Author SHA1 Message Date
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
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
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
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
oranges
a227ddf3c1 Merge pull request #34025 from DaxDupont/PDAColor 
PDA Interface color is now a preference.
 2018-01-03 21:12:09 -06:00
vuonojenmustaturska
edea89c8fe You can taste oil (#34046) 2018-01-03 15:06:54 -06:00
deathride58
6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
deathride58
64b5feae78 Merge pull request #4642 from Citadel-Station-13/upstream-merge-34038 
[MIRROR] Fixes text pad window title
 2018-01-03 18:53:51 +00:00
Leo
c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh 
Fix mimes being able to laugh audibly
 2018-01-03 07:36:43 -06:00
Leo
832b1d95df Merge pull request #34038 from ShizCalev/text-pad 
Fixes text pad window title
 2018-01-03 07:35:17 -06:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay
b6a8902e01 Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032 
[MIRROR] Unsquishes job ban panel
 2018-01-03 04:57:12 -06:00
LetterJay
ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601 
[MIRROR] Fixes cross comms
 2018-01-03 04:56:38 -06:00
Dax Dupont
417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay
d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00