Commit Graph

458 Commits

Author SHA1 Message Date
LetterJay
020b3b1160 Merge pull request #3163 from Citadel-Station-13/upstream-merge-31240
[MIRROR] Emotes now shatter 80% less immersions
2017-10-06 02:12:43 -04:00
Robustin
c8e5928517 Emotes now shatter 80% less immersions (#31240)
* Emote Checks by Default

* Removes emote argument

* More emote fixes

* Overhauled emote check

* Closed Spans
2017-10-05 15:11:28 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
LetterJay
40b8365924 Merge pull request #3154 from Citadel-Station-13/upstream-merge-31294
[MIRROR] Fix abductor scientist being unable to use science tool
2017-10-05 09:13:06 -04:00
Leo
5a0d1e5aeb Merge pull request #31294 from YPOQ/sciencetoolfix
Fix abductor scientist being unable to use science tool
2017-10-05 06:49:54 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
LetterJay
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-04 19:06:02 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232
[MIRROR] Fixes mech fab runtime
2017-10-03 20:13:06 -04:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232)
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
2017-10-03 18:19:40 -05:00
oranges
5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
KorPhaeron
4e648765db Ports dash weapons to the dash datum 2017-10-03 18:11:42 -05:00
LetterJay
f03df4f7bb Merge pull request #3082 from ktccd/fixes_flavor_text_and_changeling_dicks
Fixes flavor_text and changeling genitals
2017-10-02 21:26:15 -04:00
ktccd
3a72023532 Fixes flavor_text and changeling genitals
flavor_text is now, again, set from DNA once cloned/podded/whatever.
Changelings should do the same, and also get appropriate genitals.
Thanks TG, for overwriting this code. But really, thanks Byond, for
making extending this functionality so fucking hard.
2017-10-03 02:25:53 +02:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
acf08df884 Merge pull request #3071 from Citadel-Station-13/upstream-merge-31190
[MIRROR] Fixes Vanguard never stunning for more than 2 seconds
2017-10-01 23:40:49 -04:00
LetterJay
ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
2017-10-01 23:39:41 -04:00
Joan Lung
02987715b0 Fixes Vanguard never stunning for more than 2 seconds 2017-10-01 19:29:34 -05:00
LetterJay
1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171
[MIRROR] Lastest
2017-10-01 16:55:54 -04:00
LetterJay
5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200
[MIRROR] Fixes warning spam
2017-10-01 16:32:46 -04:00
XDTM
d274843958 Fixes viruses not calling Start on their symptoms when spreading 2017-10-01 15:22:19 -05:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
kevinz000
d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00
Jordan Brown
9082c8d241 Merge pull request #31200 from AnturK/pleasestop
Fixes warning spam
2017-10-01 08:43:36 -05:00
LetterJay
ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
92c3a48507 Merge branch 'master' into upstream-merge-31140 2017-10-01 02:53:18 -04:00
LetterJay
b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -04:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
Robustin
1a53d9e524 2H Sword to the Cult Forge - Robustin's Github Adventure 2017-10-01 00:02:04 -05:00
LetterJay
d6ec5791a6 Update dna.dm 2017-09-30 22:35:57 -05:00
Leo
fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
CitadelStationBot
aaa2a214cb [MIRROR] Fixes material container flags precedence (#3029)
* Fixes material container flags precedence

* Update material_container.dm
2017-09-30 12:39:57 -07:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
7193e9da83 Update wires.dm 2017-09-30 14:25:29 -05:00
LetterJay
cae6983aea Update wizarditis.dm 2017-09-30 14:25:05 -05:00
LetterJay
6c4934a34a Update ai_laws.dm 2017-09-30 14:22:12 -05:00
LetterJay
a6a4deb94c Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
[MIRROR] Fixes transitions
2017-09-30 15:18:26 -04:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
Jordan Brown
08ecb0e322 RegisterSignal() can now accept a list (#31098)
* RegisterSignal may now accept a list of signals

* Update old calls to RegisterSignal()
2017-09-30 08:09:42 -05:00
LetterJay
e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
LetterJay
7b3f91131b Update datum_traitor.dm 2017-09-29 23:45:07 -05:00
Jordan Brown
fdef700001 Fixes AI law weights infinite loop 2017-09-29 17:31:17 -05:00
LetterJay
e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074
[MIRROR] Ninja outfit code cleanup
2017-09-29 01:45:54 -04:00