385c9d9b22
Merge pull request #6382 from Citadel-Station-13/upstream-merge-37119
...
[MIRROR] floor is lava no longer hurts silicons
2018-04-14 07:45:42 -05:00
6b3a59b028
Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117
...
[MIRROR] Removes some duplicated code
2018-04-14 07:45:15 -05:00
86ca6b424d
Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122
...
[MIRROR] Fixes interaction AI stuff
2018-04-14 07:44:50 -05:00
fbaa2d5ae8
Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132
...
[MIRROR] Fixes brain dna
2018-04-14 07:44:36 -05:00
8dec1d8926
Merge pull request #6363 from Citadel-Station-13/upstream-merge-37110
...
[MIRROR] fixes changelings stinging other lings twice
2018-04-14 07:44:22 -05:00
2c0884765c
Merge pull request #6404 from Citadel-Station-13/upstream-merge-37167
...
[MIRROR] Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable)
2018-04-14 07:43:50 -05:00
698d89c55c
Merge pull request #6403 from Citadel-Station-13/upstream-merge-37174
...
[MIRROR] Readds dropped #endif
2018-04-14 07:43:30 -05:00
26636ece0d
Merge pull request #6400 from Citadel-Station-13/upstream-merge-37161
...
[MIRROR] Makes the PI circuit use the PI define
2018-04-14 07:43:11 -05:00
5d5dc5483e
Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158
...
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
2018-04-14 07:42:57 -05:00
a9f7e829a9
Merge pull request #6398 from Citadel-Station-13/upstream-merge-37178
...
[MIRROR] Fixes SCP 194 not using the amount variable.
2018-04-14 07:42:30 -05:00
f4b54eb9df
Merge pull request #6397 from Citadel-Station-13/upstream-merge-37177
...
[MIRROR] Reduces aurora caelus weight to that of meteors
2018-04-14 07:42:16 -05:00
e5e22c2665
Merge pull request #6396 from Citadel-Station-13/upstream-merge-37154
...
[MIRROR] Updates baseturf helpers to the new baseturf system
2018-04-14 07:41:54 -05:00
513db7eb2e
Merge pull request #6395 from Citadel-Station-13/upstream-merge-37138
...
[MIRROR] Cleans up end of round robo report
2018-04-14 07:41:32 -05:00
5a9a0c9ed9
Merge pull request #6394 from Citadel-Station-13/upstream-merge-37148
...
[MIRROR] Rounded the last digit of pi correctly
2018-04-14 07:41:12 -05:00
58e70caa69
Merge pull request #6393 from Citadel-Station-13/upstream-merge-37140
...
[MIRROR] Fixes bad style for cham projector warning
2018-04-14 07:40:57 -05:00
8b2ee170bb
Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152
...
[MIRROR] Fixes conveyor switches.
2018-04-14 07:39:47 -05:00
47c2bfd13c
Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942
...
[MIRROR] Fixes tile analyzer
2018-04-14 07:39:35 -05:00
44a273f6b8
Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) ( #37167 )
...
* Emergency NTNet patch
* ok
* @naksu
* explicit null
2018-04-14 04:43:25 -05:00
13c40be136
Readds dropped #endif ( #37174 )
2018-04-13 22:10:47 -05:00
47c783ec71
Makes the PI circuit use the PI define ( #37161 )
...
* Makes the PI circuit use PI
* I'm a moron :()
* Update arithmetic.dm
* Update arithmetic.dm
* forgot the parentheses
* that's another commit
2018-04-13 12:44:13 -05:00
5dfd1f7d42
grunge airlock
2018-04-13 09:04:55 -05:00
b56b2a94e8
Fixes SCP 194 not using the amount variable.
2018-04-13 09:03:40 -05:00
f52f0f9f33
Reduces aurora caelus weight to that of meteors
2018-04-13 09:02:28 -05:00
d139c8ebb3
Updates baseturf helpers to the new baseturf system ( #37154 )
2018-04-13 07:58:37 -05:00
8f52745322
Cleans up end of round robo report ( #37138 )
...
* Cleans up end of round robo report
* revised comment
2018-04-13 07:51:16 -05:00
5eab3eb454
Rounded the last digit of pi correctly ( #37148 )
...
It's important, fellas. Makes pi 0.000007 wrong instead of 0.00009 wrong.
2018-04-13 07:51:06 -05:00
38b2460760
Fixes bad span class for cham projector warning ( #37140 )
2018-04-13 07:49:54 -05:00
4e7d222224
Fixes conveyors. ( #37152 )
2018-04-13 04:30:32 -05:00
b7023e1bbb
Fixes tile analyzer ( #36942 )
...
* Fixes tile analyzer
* Added requested changes
* Changed turf content filter to /obj
* Added loop to add mobs to scan list
2018-04-12 11:48:28 -05:00
3a518e0e6d
Adds round id to server ban messages ( #37114 )
...
* adds round id to server ban message
* adds round id to ban denied connection message
* adds round id for legacy ban message
* B
* erroneous space
2018-04-12 11:47:08 -05:00
3cd0591d90
Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858
...
[MIRROR] Use a rust DLL for logging
2018-04-12 07:06:08 -05:00
8e293a20aa
Update asteroid.dm
2018-04-12 07:04:33 -05:00
dcff61724a
Update dna.dm
2018-04-12 07:04:09 -05:00
c26d4dc240
Update bitfields.dm
2018-04-12 07:03:47 -05:00
508e4f4d37
Update tiny_prick.dm
2018-04-12 07:03:26 -05:00
72b2d9b436
floor is lava no longer hurts silicons ( #37119 )
...
* floor is lava no longer hurts silicons
* efficiency
2018-04-12 06:37:54 -05:00
d8e3200d6c
Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953
...
[MIRROR] Stack Sheets Cancel Button
2018-04-11 21:40:22 +00:00
51147e928f
Merge pull request #6307 from Citadel-Station-13/upstream-merge-36974
...
[MIRROR] Minor VR sleeper related changes
2018-04-11 21:40:00 +00:00
2658200472
Merge pull request #6337 from Citadel-Station-13/upstream-merge-37070
...
[MIRROR] Fixes eminences not being recognized as servants of ratvar
2018-04-11 21:39:39 +00:00
512b5e86c9
Merge pull request #6341 from Citadel-Station-13/upstream-merge-36469
...
[MIRROR] AI requires silicon exp instead of crew exp for roundstart role
2018-04-11 21:38:24 +00:00
b4ecb3ef27
Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670
...
[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful
2018-04-11 21:37:24 +00:00
f89f9c372e
Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693
...
[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes
2018-04-11 21:36:35 +00:00
538cb55b68
Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791
...
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
2018-04-11 21:35:45 +00:00
ce946619b3
Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088
...
[MIRROR] Fix double-fullstop in the jukebox's description
2018-04-11 21:35:21 +00:00
1f9d19a92a
Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983
...
[MIRROR] Provides more control over uplink surplus chances.
2018-04-11 21:34:56 +00:00
6d1ee7c6e9
Merge pull request #6351 from Citadel-Station-13/upstream-merge-36604
...
[MIRROR] Code improvements on bullet damage decals
2018-04-11 21:34:32 +00:00
2502bb79bf
Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044
...
[MIRROR] Fix logic circuits runtime
2018-04-11 21:32:17 +00:00
bca8c97bdf
Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082
...
[MIRROR] Disables mood traits when mood is disabled
2018-04-11 21:31:46 +00:00
055eacca74
Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073
...
[MIRROR] Integrated Circuits Parameter Fixes
2018-04-11 21:31:17 +00:00
dd7cf18694
Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077
...
[MIRROR] Fixes warp whistle invis bug
2018-04-11 21:30:16 +00:00
LetterJay