a806ecad19
Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486
...
[MIRROR] Fixes goliath butchering
2017-09-07 15:57:03 -05:00
d5c4f6e62d
Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
...
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
93a98c000b
Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460
...
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
2017-09-07 15:54:49 -05:00
217e077342
Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469
...
[MIRROR] Fixes containment field CanPass
2017-09-07 15:54:34 -05:00
82cfa67581
Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233
...
[MIRROR] Adds a message when trying to move while buckled
2017-09-07 15:53:38 -05:00
f8d149975f
engineering objectives, removes assistant petsplosion
2017-09-07 15:43:17 -04:00
b9bbd348df
You can now drag things up and down ladders ( #30202 )
...
* Can drag things up and down ladders
* Somehow left out this line
* Icon update, auto_connect
* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
ff219f365e
Update goliath.dm ( #30486 )
2017-09-07 11:58:42 -05:00
b172025e96
Disablers and ions wont burn statues
2017-09-07 10:34:44 -05:00
b6eddd8845
ok
2017-09-07 10:34:36 -05:00
c2c69d359f
Fixes shuttle name on ramming.
2017-09-07 10:34:28 -05:00
f4dbb6dc36
Fixes drone light toggle while dead
2017-09-07 10:34:20 -05:00
df3b4c10bc
Fixes containment field CanPass
2017-09-07 10:34:11 -05:00
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
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
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
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
dd27a1850a
Adds a message when trying to move while buckled
2017-09-07 10:12:32 -05:00
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
3f025582f2
Gives admins the ability to show a read only vv window to a player
2017-09-07 10:01:47 -05:00
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
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
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
eee21d496d
oops
2017-09-07 07:23:52 -05:00
2ec925f66b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-09-07 07:21:56 -05:00
b5d80219ac
donation item
2017-09-07 07:21:42 -05:00
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
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
d8a3b87719
Fixes brains counting towards highlander killstreaks
2017-09-07 05:14:39 -05:00
d5151ed918
fixes
2017-09-07 01:01:23 -04:00
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
a972a6272f
chef objective
2017-09-06 22:54:51 -04:00
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
68a6ff5cfb
just,,, compile, please
2017-09-06 22:24:10 -04:00
4282d82e33
Allows atmos techs to download the SM monitor ( #30458 )
2017-09-06 21:00:25 -05:00
ee41b3da6f
Alters the pressure plate crafting recipe ( #30452 )
2017-09-06 20:35:50 -05:00
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
15ab156b86
moves crew objectives into separate files
2017-09-06 21:04:45 -04:00
fb0fd1ca10
adds comma
2017-09-06 20:52:28 -04:00
16669efe4a
thERE WE GO
2017-09-06 20:39:49 -04:00
fe4839db72
compile dammit
2017-09-06 20:30:12 -04:00
19628a2d9f
hnnnnnnnnngh
2017-09-06 20:23:19 -04:00
dcd0fa67f0
Adds "shiny" variants of lavaland mobs ( #30416 )
...
* Shiny lavaland mobs!
* Changes based on feedback
2017-09-06 19:15:25 -05:00
879eb6e448
more objectives, hopefully fixes compiling errors
2017-09-06 20:04:19 -04:00
849deb5e4e
Cleans up more paper fluff varedits. ( #30418 )
2017-09-06 18:42:43 -05:00
5e25464e1a
sweet jesus im absolutely horrid at this
2017-09-06 18:56:59 -04:00
2f3f56352c
Merge branch 'master' into upstream-merge-30176
2017-09-06 17:43:07 -05:00
9265694418
Update _compile_options.dm
2017-09-06 17:41:02 -05:00
f9ef2bb068
commit
2017-09-06 17:36:32 -05:00
8ef2b39d44
adds clown slip objective
2017-09-06 18:34:05 -04:00
LetterJay