oranges
|
5fdaba2b0e
|
Merge pull request #31693 from Armhulen/patch-12
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
|
2017-10-13 23:49:54 -05:00 |
|
LetterJay
|
8aebc3b15a
|
Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
[MIRROR] Radiation rework and subsystem
|
2017-10-13 23:58:04 -04:00 |
|
LetterJay
|
e18e99f56f
|
Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
[MIRROR] Fixes electrocution animation
|
2017-10-13 23:37:46 -04:00 |
|
LetterJay
|
aed26b120c
|
Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584
[MIRROR] Fixes ruins spawning over shuttle docks
|
2017-10-13 23:36:10 -04:00 |
|
LetterJay
|
66585f242c
|
Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512
[MIRROR] Refactors away mission & space ruin area code.
|
2017-10-13 23:36:01 -04:00 |
|
LetterJay
|
8360e8afd1
|
Merge pull request #3339 from Citadel-Station-13/upstream-merge-31557
[MIRROR] Cleans up some direct loc setting-s in single tank bombs
|
2017-10-13 23:35:52 -04:00 |
|
LetterJay
|
14dc8a5a35
|
Update life.dm
|
2017-10-13 12:30:35 -05:00 |
|
LetterJay
|
2d66ab4171
|
Update life.dm
|
2017-10-13 10:26:25 -05:00 |
|
Emmett Gaines
|
55e8f6526c
|
Radiation rework and subsystem
|
2017-10-13 09:22:23 -05:00 |
|
kevinz000
|
c84a270403
|
Fixes preferences generation (#31607)
|
2017-10-13 09:16:03 -05:00 |
|
Jordan Brown
|
1941a8fcfa
|
Merge pull request #31614 from AnturK/zap
Fixes electrocution animation
|
2017-10-13 09:14:45 -05:00 |
|
LetterJay
|
cd562a3c87
|
Update centcomAway.dm
|
2017-10-13 07:30:23 -05:00 |
|
LetterJay
|
09d929e9ca
|
Merge branch 'master' into upstream-merge-31643
|
2017-10-13 07:59:09 -04:00 |
|
LetterJay
|
58b8a02802
|
Update gas_mixture.dm
|
2017-10-13 02:59:04 -05:00 |
|
LetterJay
|
1e5a6234aa
|
Update ruins.dm
|
2017-10-13 02:58:26 -05:00 |
|
LetterJay
|
b08f278127
|
Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580
[MIRROR] Fixes init times
|
2017-10-13 02:02:16 -04:00 |
|
LetterJay
|
6f9d1893ca
|
Merge pull request #3342 from Citadel-Station-13/upstream-merge-31396
[MIRROR] Adds tick check to ore boxes
|
2017-10-13 02:01:52 -04:00 |
|
LetterJay
|
fb444f173a
|
Merge pull request #3351 from Citadel-Station-13/upstream-merge-31582
[MIRROR] Notify admins when someone activates a smoke machine
|
2017-10-13 02:00:46 -04:00 |
|
LetterJay
|
51f5d5423c
|
Merge pull request #3358 from Citadel-Station-13/upstream-merge-31502
[MIRROR] Adds a fireball from the heavens as an admin smite
|
2017-10-13 00:21:01 -04:00 |
|
LetterJay
|
f4852314dd
|
Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588
[MIRROR] Fixes stationary mob parallax
|
2017-10-13 00:20:46 -04:00 |
|
LetterJay
|
b43a207390
|
Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586
[MIRROR] Fixes canisters breaking multiple times
|
2017-10-13 00:20:38 -04:00 |
|
LetterJay
|
ea7b3d101d
|
Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585
[MIRROR] Fixes empty light fixtures showing as working lights in DM
|
2017-10-13 00:06:06 -04:00 |
|
LetterJay
|
b0f1ecda37
|
Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569
[MIRROR] Fixes conveyor belt layering
|
2017-10-12 23:55:05 -04:00 |
|
LetterJay
|
25396db2df
|
Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605
[MIRROR] Fixes cryo
|
2017-10-12 23:45:42 -04:00 |
|
LetterJay
|
d02dcb496e
|
Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542
[MIRROR] makes vacuums "cold", sort of
|
2017-10-12 23:40:55 -04:00 |
|
LetterJay
|
0263f44791
|
Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554
[MIRROR] Fix lavaland turfs looking awkward to AIs
|
2017-10-12 23:38:00 -04:00 |
|
LetterJay
|
3ee44b45f9
|
Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556
[MIRROR] Fixes client vv not working.
|
2017-10-12 23:27:54 -04:00 |
|
Armhulen
|
49d5d08456
|
Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?
* yeah yeah YEAH
* cucked again!
* it works
* I SAID IT WORKS
|
2017-10-12 20:37:58 -05:00 |
|
Jordan Brown
|
14dcd3aee5
|
Activates global warming
|
2017-10-12 20:04:15 -05:00 |
|
Jordan Brown
|
7ef36802ff
|
Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
|
2017-10-12 16:07:12 -05:00 |
|
Jordan Brown
|
ca4907b881
|
Merge pull request #31582 from feemjmeem/smoke-log-announcing
Notify admins when someone activates a smoke machine
|
2017-10-12 16:03:50 -05:00 |
|
Jordan Brown
|
2a68dce1ed
|
Fixes ruins spawning over shuttle docks
|
2017-10-12 16:02:39 -05:00 |
|
YPOQ
|
848016ab15
|
Fixes canisters breaking multiple times (#31586)
|
2017-10-12 15:48:17 -05:00 |
|
Jordan Brown
|
572f3b8905
|
Merge pull request #31585 from ShizCalev/empty-light-editor-fix
Fixes empty light fixtures showing as working lights in DM
|
2017-10-12 15:27:37 -05:00 |
|
ShizCalev
|
74c9b75ba1
|
Refactors away mission & space ruin area code.
|
2017-10-12 12:46:52 -05:00 |
|
kevinz000
|
46c9ddb81c
|
Adds tick check to ore boxes (#31396)
* Update satchel_ore_boxdm.dm
* Update satchel_ore_boxdm.dm
* Update satchel_ore_boxdm.dm
* Update satchel_ore_boxdm.dm
* Update satchel_ore_boxdm.dm
|
2017-10-12 12:39:18 -05:00 |
|
kevinz000
|
fbf5568547
|
Update bomb.dm (#31557)
|
2017-10-12 12:36:48 -05:00 |
|
ShizCalev
|
f696ada7c8
|
Fixes conveyor belt layering (#31569)
|
2017-10-12 12:34:19 -05:00 |
|
Jordan Brown
|
763bcc59ee
|
Merge pull request #31605 from AnturK/cryofix
Fixes cryo
|
2017-10-12 11:56:09 -05:00 |
|
duncathan salt
|
425915615b
|
makes vacuums "cold", sort of (#31542)
|
2017-10-12 11:47:51 -05:00 |
|
LetterJay
|
06061f0870
|
Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530
[MIRROR] Allows snoring while unconscious
|
2017-10-12 12:37:03 -04:00 |
|
LetterJay
|
dc5aeb33e6
|
Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475
[MIRROR] Removes spawns from assembly code
|
2017-10-12 12:36:53 -04:00 |
|
Tad Hardesty
|
00606b9303
|
Fix lavaland turfs looking awkward to AIs (#31554)
|
2017-10-12 10:40:38 -05:00 |
|
Kyle Spier-Swenson
|
6c27182bec
|
Fixes client vv not working. (#31556)
|
2017-10-12 10:39:28 -05:00 |
|
LetterJay
|
41846d0793
|
Merge branch 'master' into upstream-merge-31599
|
2017-10-12 11:00:37 -04:00 |
|
LetterJay
|
4a8f3d0e41
|
fuck this shit
|
2017-10-12 09:58:16 -05:00 |
|
LetterJay
|
22899f1942
|
Merge branch 'master' into upstream-merge-31580
|
2017-10-12 07:22:11 -04:00 |
|
LetterJay
|
2e503acc57
|
Update assembly.dm
|
2017-10-12 06:21:30 -05:00 |
|
LetterJay
|
f93733576e
|
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
[MIRROR] Minor refactor of how gas IDs are handled
|
2017-10-12 07:19:30 -04:00 |
|
LetterJay
|
07f0a5f503
|
Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
|
2017-10-12 07:18:35 -04:00 |
|