LetterJay
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -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
LetterJay
eb24540ba3
Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108
...
[MIRROR] Corrected shuttle refuel time
2017-10-01 15:07:43 -04:00
kevinz000
d76eb00634
Update viral.dm
2017-10-01 13:11:05 -05:00
LetterJay
490885a36f
update
2017-10-01 13:02:52 -05:00
Jordan Brown
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
kevinz000
8636b0a942
Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
2017-10-01 09:26:45 -05:00
vuonojenmustaturska
e79cd3369f
Fixes station name in cargo stock displays ( #31155 )
2017-10-01 09:26:37 -05:00
kevinz000
40bcb74a56
Fixes delete hotkey triggering messages when the user isn't even a living mob ( #31165 )
2017-10-01 09:25:27 -05:00
Jordan Brown
9082c8d241
Merge pull request #31200 from AnturK/pleasestop
...
Fixes warning spam
2017-10-01 08:43:36 -05:00
kevinz000
b13f2012fb
Update closed.dm
2017-10-01 08:42:26 -05:00
AnturK
c4dd7ffdbd
Fixes paper writing ( #31203 )
...
* Fixes regex typo
* Actually fixes it properly
2017-10-01 08:41:16 -05:00
AnturK
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
ShizCalev
770a0a1154
Fixes aliums being able to attack the SM crystal
2017-10-01 05:04:30 -05:00
LetterJay
9f05ef16df
Merge branch 'master' into upstream-merge-31108
2017-10-01 04:31:36 -04:00
LetterJay
926db45b54
Update world.dm
2017-10-01 03:06:11 -05:00
LetterJay
80a84db919
Update adminhelp.dm
2017-10-01 02:39:24 -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
22b148f078
Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140
...
[MIRROR] Fixes AI law weights infinite loop
2017-10-01 03:26:42 -04:00
LetterJay
37942a2279
Update hostile.dm
2017-10-01 01:57:49 -05:00
LetterJay
49c63dd794
Update randomverbs.dm
2017-10-01 01:57:03 -05:00
LetterJay
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
LetterJay
4be6f22669
Merge branch 'master' into upstream-merge-31108
2017-10-01 02:53:27 -04:00
LetterJay
92c3a48507
Merge branch 'master' into upstream-merge-31140
2017-10-01 02:53:18 -04:00
LetterJay
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -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
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -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
LetterJay
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJay
1d1a862e1b
Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
...
[MIRROR] Reebe is fancier now
2017-10-01 02:20:23 -04:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
oranges
2e0513bb50
Fixes master
2017-10-01 00:52:23 -05:00
ninjanomnom
009532b907
for completeness sake
2017-10-01 00:21:47 -05:00
LetterJay
0cc54029e2
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
...
[MIRROR] Cleans up some unused code
2017-10-01 01:19:36 -04:00
LetterJay
33b481dffb
Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
...
[MIRROR] Log attempted injections as well as successful ones
2017-10-01 01:19:20 -04:00
LetterJay
f55c86edfb
Merge branch 'master' into upstream-merge-31045
2017-10-01 01:17:52 -04:00
kingofkosmos
0f387451f7
You can now examine an airlock to find out how to construct/deconstruct it ( #30605 )
...
* Tweaks rwall construction examine-messages.
* Tweaks window construction examine-messages.
* Added airlock construction examine messages.
* Typo fix.
* Shortened the airlock electronics circuit message.
* Fixed examine text styles.
* Fixes.
* Fixed wall-examine showing on rwalls.
* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.
* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.
* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.
* Removed unnecessary rwall-examine.
* Sound full path.
2017-10-01 00:04:14 -05:00
Robustin
1a53d9e524
2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-01 00:02:04 -05:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
LetterJay
d6ec5791a6
Update dna.dm
2017-09-30 22:35:57 -05:00
Leo
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05:00
Leo
57b2a3618e
Merge pull request #31132 from KorPhaeron/lingfix
...
Fixes changelings being able to transform sting mobs that are transform sting immune
2017-09-30 21:36:32 -05:00
Leo
d845fc7aa8
Removes irccheck admin restriction
2017-09-30 21:34:22 -05:00
ShizCalev
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
KorPhaeron
e53fd73557
Fixes meteors not working with multi z ( #31137 )
2017-09-30 21:33:06 -05:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
MoreRobustThanYou
e63e05255f
Fixes cogscarab sprites not updating ( #31142 )
...
* Fixes cogscarab sprites now updating
* fix spacing
* Update extra_drone_types.dm
2017-09-30 21:30:48 -05:00
vuonojenmustaturska
e8a1ceffcb
Speeds up simple_animals/hostile/proc/CanAttack()
2017-09-30 19:48:59 -05:00
AnturK
6411e25110
Fixes liches losing spells
2017-09-30 14:54:02 -05:00
