LetterJay
32fb136bf0
Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855
...
[MIRROR] Dullahans
2017-10-30 23:54:25 -04:00
LetterJay
09a198fb65
Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225
...
[MIRROR] Deterministic output slots for smartfridges
2017-10-30 23:32:39 -04:00
LetterJay
53314289c8
Merge branch 'master' into upstream-merge-31855
2017-10-30 23:31:13 -04:00
LetterJay
1092b020f4
Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
...
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
LetterJay
df6bd6fa4c
Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140
...
[MIRROR] Fixes filling smoke machines with pills
2017-10-30 22:11:44 -04:00
LetterJay
6963ad2aac
Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
...
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
vuonojenmustaturska
5bd7184d9c
Deterministic output slots for smartfridges ( #32225 )
...
* a spooky commit
* It is too late, the skeleton is already inside you
* mexican river dolphins for halloween 2018
* Compiler warnings for halloween 2018
2017-10-30 14:35:26 -05:00
bawhoppen
f8bd9ecf9c
Fixes old simple animal humanoid issues ( #32214 )
...
* fixes issue
* ignore that
* Spacebattle doesn't even open in DM
* Conflicts fixed for real
* Fixes pathing weirdness
* wonderful
2017-10-30 06:50:04 -05:00
LetterJay
b6a04b6649
Merge pull request #3689 from Citadel-Station-13/CharacterCreation
...
Fixes character issues on creation
2017-10-30 07:02:15 -04:00
LetterJay
ed2208a7ea
Merge pull request #3687 from Michiyamenotehifunana/CRITICAL-SPRITER-CRAP-NERFS
...
CRITICAL BALANCE FIXES TO CITADEL'S GUNS
2017-10-30 06:33:15 -04:00
LetterJay
e0cbc7b9a2
Fixes character issues on creation
2017-10-30 05:32:06 -05:00
Michiyamenotehifunana
d0a28fcd62
NERF EVERYTHING
...
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
969f92fb58
Delete nudge.py
2017-10-30 01:48:48 -05:00
LetterJay
fba46cd0e5
Delete server_tools.dm
2017-10-30 01:48:42 -05:00
LetterJay
48cc684de0
Update golems.dm
2017-10-29 22:41:23 -05:00
LetterJay
b0573cc67f
Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144
...
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
2017-10-29 23:38:55 -04:00
LetterJay
715a2fb918
Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
...
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
PKPenguin321
e486038c2e
Fixes filling smoke machines with pills ( #32140 )
...
Fixes #32102
Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-29 16:01:34 -05:00
LetterJay
2715fa9953
Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174
...
[MIRROR] Halloween race fixes
2017-10-29 16:05:19 -04:00
LetterJay
66245d9451
Merge pull request #3674 from Citadel-Station-13/upstream-merge-32154
...
[MIRROR] Events take pre-game lobby time into account
2017-10-29 15:52:13 -04:00
LetterJay
c5565dff94
Merge pull request #3669 from Citadel-Station-13/upstream-merge-32168
...
[MIRROR] One more thing to allow more mobs to qdel nicely
2017-10-29 15:50:44 -04:00
LetterJay
254ffca3b7
Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162
...
[MIRROR] Actually fixes meteors, again
2017-10-29 15:49:40 -04:00
LetterJay
47cfffbb26
Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116
...
[MIRROR] Line by line profiling system
2017-10-29 15:48:47 -04:00
Ashe Higgs
284b265a65
Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-29 13:57:10 -05:00
KorPhaeron
edfc86c895
Halloween race fixes
2017-10-29 12:31:38 -05:00
bgobandit
adf7bdccbd
Adds new valentines; replaces outdated/shitty ones. ( #32144 )
...
* adds valentines, cuts old references
* Adds valentines, replaces outdated ones
* more entendre-y
2017-10-29 11:04:04 -05:00
Armhulen
9c63e30e2f
Ice Spiders now use frost oil instead of toxin ( #32080 )
...
* PARASTENG!!
* just monika
2017-10-29 11:02:50 -05:00
Kyle Spier-Swenson
8d234df96f
Events take pre-game lobby time into account ( #32154 )
...
* Events take pre-game lobby time into account
* Friends don't let friends code without coffee.
It would appear that I have no friends
* i blame cyberboss
2017-10-29 10:36:56 -05:00
vuonojenmustaturska
53c9c16fe3
one more thing to allow more mobs to qdel nicely ( #32168 )
2017-10-29 07:14:44 -05:00
vuonojenmustaturska
d6d01ab630
Actually fixes meteors, again ( #32162 )
...
* Actually fixes meteors, again
* unrelated typo fix for an admin debug verb
2017-10-29 07:13:31 -05:00
LetterJay
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
LetterJay
077e2a1598
Merge pull request #3655 from Citadel-Station-13/upstream-merge-32112
...
[MIRROR] "Mummies" (cloth golems) for Halloween
2017-10-29 04:20:28 -04:00
LetterJay
2503a90dc0
Merge pull request #3585 from Michiyamenotehifunana/CX-sword
...
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
LetterJay
41eb83fb3d
Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127
...
[MIRROR] [s] Blocks world proc calls
2017-10-29 03:47:43 -04:00
LetterJay
fb24abfaf7
Merge pull request #3652 from Citadel-Station-13/upstream-merge-32142
...
[MIRROR] Remove stray parent proc call in collector code
2017-10-29 03:46:30 -04:00
LetterJay
13891ec34b
Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107
...
[MIRROR] Adds some new grindables to the grinder
2017-10-29 03:46:19 -04:00
LetterJay
7402fab19e
Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137
...
[MIRROR] Remove some unneeded null checks in lighting
2017-10-29 03:46:05 -04:00
LetterJay
4b300cee6c
Merge branch 'master' into upstream-merge-32116
2017-10-29 03:45:59 -04:00
LetterJay
5f9a76c6dd
Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009
...
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
2017-10-29 03:45:06 -04:00
LetterJay
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
LetterJay
a595bee5af
Update preferences.dm
2017-10-29 01:58:33 -05:00
LetterJay
95023664dd
Update preferences.dm
2017-10-29 01:53:35 -05:00
LetterJay
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
f77b66ebb9
Update preferences.dm
2017-10-29 01:40:28 -05:00
LetterJay
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
LetterJay
3b91f4efcc
Merge branch 'master' into upstream-merge-32096
2017-10-29 01:49:22 -04:00
LetterJay
debaad2948
Update podpeople.dm
2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7
Update furrypeople.dm
2017-10-29 00:47:25 -05:00
LetterJay
180e730be9
Update species.dm
2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d
Update species.dm
2017-10-29 00:25:17 -05:00
