shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

4805 Commits

Author SHA1 Message Date
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
deathride58
61fdecffe5 ohhHH 2018-01-04 02:30:52 -05:00
deathride58
70e5568d32 web editor is garbage on mobile 2018-01-04 02:26:44 -05:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
deathride58
8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
deathride58
273b38a765 mob living simple_animal 2018-01-04 01:23:37 -05:00
deathride58
66f0a9c2b7 mob living silicon 2018-01-04 01:06:25 -05:00
deathride58
4957aa3cb0 mob living - root 2018-01-04 01:03:39 -05:00
deathride58
bdd460ed4a mob folder - root 2018-01-04 01:02:04 -05:00
deathride58
fd9bc8c35e mob folder - camera to dead 2018-01-04 00:59:07 -05:00
deathride58
cffbbbbbd1 mapping to mining, preparing for mob folder 2018-01-04 00:55:01 -05:00
deathride58
5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05: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