Commit Graph

9947 Commits

Author SHA1 Message Date
vuonojenmustaturska
da5812b07b Stops ghosts from being able to start plasma fires 2018-04-15 12:39:40 -05:00
deathride58
60a35c5270 Merge pull request #6409 from Citadel-Station-13/upstream-merge-37194
[MIRROR] Fixes SCP being deconstructable
2018-04-14 20:39:12 +00:00
deathride58
a3279d6de2 Merge pull request #6408 from Citadel-Station-13/upstream-merge-37095
[MIRROR] sucessfully fixes some grammar
2018-04-14 20:38:52 +00:00
deathride58
fc035e2b61 Merge pull request #6407 from Citadel-Station-13/upstream-merge-37176
[MIRROR] Removes startup message in sql log
2018-04-14 20:38:33 +00:00
deathride58
dae96ee19b Merge pull request #6406 from Citadel-Station-13/upstream-merge-37168
[MIRROR] Fixes imps all having the same name
2018-04-14 20:38:08 +00:00
deathride58
6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417
[MIRROR] RPD pipe autowrenching
2018-04-14 20:37:42 +00:00
vuonojenmustaturska
26fb305551 zoinks 2018-04-14 10:57:55 -05:00
Tlaltecuhtli
3ffe415eb8 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 08:12:34 -05:00
Jordie
9ce8aae7dd removes startup message in sql log (#37176) 2018-04-14 08:11:20 -05:00
shrimpboom8
677f3e8a7b Fixes imps all having the same name (#37168)
* Update imp.dm

* Replaced 1 with TRUE
2018-04-14 08:10:07 -05:00
LetterJay
8b2a75c108 Merge pull request #6380 from Citadel-Station-13/upstream-merge-37005
[MIRROR] Changes ore-burning math to avoid decimals (and raise RNG)
2018-04-14 07:46:20 -05:00
LetterJay
a861726664 Merge pull request #6379 from Citadel-Station-13/upstream-merge-37125
[MIRROR] Shuttle window spawner name fix
2018-04-14 07:46:04 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
fbaa2d5ae8 Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132
[MIRROR] Fixes brain dna
2018-04-14 07:44:36 -05:00
LetterJay
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
LetterJay
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
LetterJay
698d89c55c Merge pull request #6403 from Citadel-Station-13/upstream-merge-37174
[MIRROR] Readds dropped #endif
2018-04-14 07:43:30 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
8b2ee170bb Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152
[MIRROR] Fixes conveyor switches.
2018-04-14 07:39:47 -05:00
LetterJay
47c2bfd13c Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942
[MIRROR] Fixes tile analyzer
2018-04-14 07:39:35 -05:00
kevinz000
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
AnturK
13c40be136 Readds dropped #endif (#37174) 2018-04-13 22:10:47 -05:00
Nich
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
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
Dax Dupont
b56b2a94e8 Fixes SCP 194 not using the amount variable. 2018-04-13 09:03:40 -05:00
Jordan Brown
f52f0f9f33 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00
Emmett Gaines
d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 07:58:37 -05:00
ShizCalev
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
Putnam3145
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
ShizCalev
38b2460760 Fixes bad span class for cham projector warning (#37140) 2018-04-13 07:49:54 -05:00
AnturK
4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -05:00
robbym
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
Jordie
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
LetterJay
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
LetterJay
8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
LetterJay
dcff61724a Update dna.dm 2018-04-12 07:04:09 -05:00
LetterJay
c26d4dc240 Update bitfields.dm 2018-04-12 07:03:47 -05:00
LetterJay
508e4f4d37 Update tiny_prick.dm 2018-04-12 07:03:26 -05:00
kevinz000
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
Grandmother of 50
4e74f63147 Changes ore-burning math to avoid decimals (and raise RNG) (#37005)
* Update ores_coins.dm

* I want that to return watson

* Finally a stats course comes in handy...

* Update ores_coins.dm

* Yay mods :)

* pants on head
2018-04-12 06:37:33 -05:00
vuonojenmustaturska
bc68ed8536 Merge pull request #37125 from 81Denton/shuttle-window-name
Shuttle window spawner name fix
2018-04-12 06:37:25 -05:00