LetterJay
c55ac69e4a
Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458
...
[MIRROR] Allows atmos techs to download the SM monitor
2017-09-07 10:23:15 -05:00
LetterJay
21a72cd04c
Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436
...
[MIRROR] More timer debugging for the debug gods.
2017-09-07 10:22:45 -05:00
LetterJay
9ca0d6588d
Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400
...
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
2017-09-07 10:22:17 -05:00
LetterJay
8d854a53d8
Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426
...
[MIRROR] Fixes swarmers breaking the SM's containment
2017-09-07 10:21:57 -05:00
Ashe Higgs
938c10ad1c
Adds a unique suicide to the hierophant club, plus some attack verbs ( #30400 )
...
* Adds a suicide to the hierophant club
* Above
* good point
* Removes the delay
2017-09-07 10:01:55 -05:00
LetterJay
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
Kyle Spier-Swenson
4b02f01a66
More timer debugging for the debug gods. ( #30436 )
...
* More timer debugging for the debug gods.
* Its times like this I wish I could amend commit from the web interface
* git commit -a -amend&&git push --force
2017-09-07 09:59:28 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
eee21d496d
oops
2017-09-07 07:23:52 -05:00
LetterJay
2ec925f66b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-09-07 07:21:56 -05:00
LetterJay
b5d80219ac
donation item
2017-09-07 07:21:42 -05:00
LetterJay
1162edad65
Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452
...
[MIRROR] Alters the pressure plate crafting recipe
2017-09-07 06:26:51 -05:00
ShizCalev
7fb4426011
Fixes swarmers breaking the SM's containment ( #30426 )
...
* Fixes swamers breaking the SM
* Switched checks to use get_area
2017-09-07 05:17:51 -05:00
LetterJay
5829f56727
Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176
...
[MIRROR] Adds more round id tracking
2017-09-06 21:31:28 -05:00
ShizCalev
4282d82e33
Allows atmos techs to download the SM monitor ( #30458 )
2017-09-06 21:00:25 -05:00
Anonmare
ee41b3da6f
Alters the pressure plate crafting recipe ( #30452 )
2017-09-06 20:35:50 -05:00
LetterJay
3efa1d6134
Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416
...
[MIRROR] Adds "shiny" variants of lavaland mobs
2017-09-06 20:18:27 -05:00
Ashe Higgs
dcd0fa67f0
Adds "shiny" variants of lavaland mobs ( #30416 )
...
* Shiny lavaland mobs!
* Changes based on feedback
2017-09-06 19:15:25 -05:00
ShizCalev
849deb5e4e
Cleans up more paper fluff varedits. ( #30418 )
2017-09-06 18:42:43 -05:00
LetterJay
2f3f56352c
Merge branch 'master' into upstream-merge-30176
2017-09-06 17:43:07 -05:00
LetterJay
9265694418
Update _compile_options.dm
2017-09-06 17:41:02 -05:00
LetterJay
f9ef2bb068
commit
2017-09-06 17:36:32 -05:00
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
LetterJay
bbab9d8d5a
donation
2017-09-06 14:41:35 -05:00
LetterJay
a16ba4e4cd
Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953
...
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
2017-09-06 10:11:16 -05:00
LetterJay
4ed411d353
Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079
...
[MIRROR] Fixes missing inhands
2017-09-06 10:11:08 -05:00
LetterJay
d4f018952e
Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866
...
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
2017-09-06 10:10:58 -05:00
LetterJay
82f36f0d28
Delete client_procs.dm.rej
2017-09-06 09:27:57 -05:00
LetterJay
ce1e5c69dc
Delete blackbox.dm.rej
2017-09-06 09:27:55 -05:00
LetterJay
b07ebeed57
Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140
...
[MIRROR] Corrects column name
2017-09-06 09:26:12 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
b2d7ee0e51
Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248
...
[MIRROR] Changes sql version to check for schema being ahead
2017-09-06 09:23:02 -05:00
LetterJay
ea10c4402e
Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027
...
[MIRROR] Fixes hair sticking out of spess helmets
2017-09-06 09:22:44 -05:00
LetterJay
00199af27d
Merge branch 'master' into upstream-merge-29866
2017-09-06 09:21:53 -05:00
LetterJay
72a8f7aa54
Merge branch 'master' into upstream-merge-29953
2017-09-06 09:17:57 -05:00
LetterJay
cf46abecb3
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
...
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
LetterJay
b6f6970ebb
Update disease.dm
2017-09-06 09:06:59 -05:00
LetterJay
1f872675b0
Update disease.dm
2017-09-06 09:06:30 -05:00
LetterJay
f5e8e06041
Update dogborgstuff.dm
2017-09-06 09:04:33 -05:00
LetterJay
2d469c62ef
Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve
...
Bad mirror resolve
2017-09-06 08:59:20 -05:00
Poojawa
3ba2f650dd
Adds Paradise Sofas ( #2623 )
...
* Adds Paradise Sofas
* Actually enable them to be constructed
* Coding standards, sheesh
* am path guder
2017-09-06 07:54:23 -05:00
Poojawa
fc95b9594c
Re-disables sabresune, because wew
2017-09-05 21:23:15 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
LetterJay
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
LetterJay
737c8446c1
Merge pull request #2592 from Citadel-Station-13/ProperDisable
...
Disables the swarmer events for now
2017-09-05 15:57:19 -05:00
Poojawa
9bca718151
Fixes prey digestion noises and loop ( #2616 )
2017-09-05 12:53:35 -05:00
Poojawa
ef83a2db86
enables sabresune but locked for reason.
2017-09-05 07:33:55 -05:00
Poojawa
3a76fdc2e9
Update supply.dm
2017-09-04 21:26:19 -05:00
Poojawa
32742f0b53
fixes skunk tails too
2017-09-04 09:28:50 -05:00
Poojawa
362b4b5a16
Fixes Poly ( #2598 )
2017-09-04 09:08:25 -05:00
