721f628f60
Merge pull request #34918 from AutomaticFrenzy/patch/armament
...
Correct spelling of armament
2018-01-26 03:01:01 -06:00
0c86312618
Merge pull request #5100 from Citadel-Station-13/upstream-merge-34860
...
[MIRROR] Fixes double camera assemblies when deconstructing cameras
2018-01-25 14:15:29 -06:00
13c3c7b4e7
Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466
...
[MIRROR] Fake nuclear disks are even more convincing
2018-01-25 13:41:02 -06:00
90bcf0ef84
Merge pull request #34860 from YPOQ/camerafix
...
Fixes double camera assemblies when deconstructing cameras
2018-01-25 05:11:07 -06:00
9234d01b76
Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773
...
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
2018-01-25 00:51:00 -06:00
d73cd1d35f
Merge pull request #5095 from Citadel-Station-13/upstream-merge-34752
...
[MIRROR] Clown traitors can buy clown bombs now
2018-01-24 21:45:51 -06:00
50c3debdcf
Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383
...
[MIRROR] You can now defib monkeys
2018-01-24 21:45:16 -06:00
1dffa54809
Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623
...
[MIRROR] Makes templates able to use PlaceOnTop
2018-01-24 21:44:21 -06:00
c2df8bbacc
Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848
...
[MIRROR] Adds new landmark icons
2018-01-24 21:42:12 -06:00
e9cdf72439
less than 100
2018-01-24 21:23:37 -06:00
b89007ade5
Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746
...
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
2018-01-24 20:48:03 -06:00
793b4be13f
Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773
...
[MIRROR] Shifts vars off /mob to the correct subtype
2018-01-24 20:46:46 -06:00
dd31c777a5
Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807
...
[MIRROR] Fixes the kitchen spike turning people upside down forever
2018-01-24 20:46:16 -06:00
f0b83ee23d
Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611
...
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
2018-01-24 20:45:16 -06:00
d573e67ff6
Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487
...
[MIRROR] Costumes for nuclear operatives
2018-01-24 20:44:43 -06:00
cbaca56dbf
Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458
...
[MIRROR] Refactors and nerfs Fleshmend
2018-01-24 20:44:30 -06:00
ad50662c94
Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285
...
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
2018-01-24 20:44:15 -06:00
35be96ed64
You can now defib monkeys ( #34383 )
...
* You can now defib non-human carbons
* WOOPS
* Woops.
2018-01-24 18:40:05 -06:00
829cf4d180
Merge pull request #34623 from ninjanomnom/template-placeontop
...
Makes templates able to use PlaceOnTop
2018-01-24 18:18:31 -06:00
6ed56158e3
Adds new landmark icons ( #34848 )
...
* Adds new landmark icons
* Update
* Blue
2018-01-24 18:08:33 -06:00
072056f919
Update fleshmend.dm
2018-01-24 15:40:05 -06:00
8b2da0aa90
Merge pull request #34746 from DaxDupont/autolathe
...
Makes the autolathe repeat it's animation while it's still printing.
2018-01-24 14:14:37 -06:00
eb1a6b89ef
One can no longer use cogscarab as a form of Eminence priority. ( #34611 )
...
Cogscarabs are meant to build, and wasting an integral (building) slot for something you can get as a ghost so you get priority is shitty to both other ghosts and team (the second one being an admin issue).
If you want to go eminence, you can roll for it as a ghost like everyone else.
2018-01-24 14:03:08 -06:00
481f73aba0
Costumes for nuclear operatives
2018-01-24 13:58:35 -06:00
85a7788dd3
Merge branch 'master' into upstream-merge-34773
2018-01-24 13:58:12 -06:00
be9f8a2d06
Refactors and nerfs Fleshmend
2018-01-24 13:56:20 -06:00
b898e53be0
Merge pull request #5065 from Citadel-Station-13/upstream-merge-34775
...
[MIRROR] Removed named args from visible_message
2018-01-24 13:54:34 -06:00
f8c349ea54
Gives clockwork marauders a reasonable cost/cooldown ( #34285 )
...
balance: Clockwork marauders now take more time (+3s) and power (7x) to create.
balance: The "recent marauder" time limit is now 60 seconds, up from 20. The limit now has a significantly smaller effect on summon time but will act as a further cap on marauder summoning until it has passed.
tweak: The marauder cap will now only account for living cultists.
2018-01-24 13:53:03 -06:00
ee253a6c54
Merge pull request #5055 from Citadel-Station-13/upstream-merge-34808
...
[MIRROR] Abstract landmarks are now indestructible
2018-01-24 13:52:41 -06:00
8315716380
Merge pull request #5053 from Citadel-Station-13/upstream-merge-34766
...
[MIRROR] Xeno nests are no longer held together by bolts.
2018-01-24 13:51:48 -06:00
3aa246d39b
[Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
2018-01-24 13:47:40 -06:00
7267f4a5f3
Fixes the kitchen spike turning people upside down forever ( #34807 )
2018-01-24 13:02:39 -06:00
cae2e5e1eb
Shifts vars off /mob to the correct subtype
2018-01-24 12:00:05 -06:00
e71ce4e8cf
Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
...
Removed named args from visible_message
2018-01-24 11:59:50 -06:00
d7c317b6d0
Abstract landmarks are now indestructible ( #34808 )
...
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.
There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
2018-01-24 06:12:57 -06:00
f903330b0e
Xeno nests are no longer held together by bolts. ( #34766 )
...
* Update bed.dm
* Update alien_nest.dm
2018-01-24 06:12:37 -06:00
070a4bc0c4
Merge pull request #34817 from ninjanomnom/stop-pointing-at-me
...
Makes the point effect not trigger movement code
2018-01-24 06:12:29 -06:00
f26f1b5370
Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
...
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
4c2c14784b
Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560
...
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
2018-01-23 09:59:41 -06:00
ab002f56be
Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778
...
[MIRROR] Fixes invalid pollCandidatesForMob args
2018-01-23 08:24:31 -06:00
30ae21043f
Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476
...
[MIRROR] Simple rotation component.
2018-01-23 08:24:19 -06:00
acb333d403
Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765
...
[MIRROR] Fixes APC controller runtime
2018-01-23 08:22:56 -06:00
a7270f43cd
Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750
...
[MIRROR] current sanity check in ark of the justicar
2018-01-23 08:21:10 -06:00
d540b69adc
Update nuclearbomb.dm
2018-01-23 08:20:52 -06:00
9f24bac5e6
Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142
...
[MIRROR] Refactors infrared beams to update faster
2018-01-23 08:18:38 -06:00
ccf1f97478
Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810
...
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
2018-01-23 08:18:21 -06:00
8ad54530a1
Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759
...
[MIRROR] Consolidated t-ray scanner code
2018-01-23 08:16:52 -06:00
326228c43c
Merge pull request #34778 from ShizCalev/pollCandidatesForMob
...
Fixes invalid pollCandidatesForMob args
2018-01-23 06:42:08 -06:00
eb7974df7d
Simple rotation component. ( #34476 )
...
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 02:09:16 -06:00
4dac26d2da
Merge pull request #34765 from ShizCalev/apc-controller-runtime
...
Fixes APC controller runtime
2018-01-23 01:42:43 -06:00
Jordan Brown