Commit Graph

8119 Commits

Author SHA1 Message Date
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
241d2d88e6 Merge pull request #3688 from Citadel-Station-13/upstream-merge-32156
[MIRROR] Fixes TakeComponent
2017-10-30 07:11:14 -04: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
9ea376dc81 fixes soporifics having the old two shot value
SSSSSH JUST PRETEND IT WAS A MISTAKE
2017-10-30 17:33:01 +08:00
CitadelStationBot
c7bfa28dce Fixes TakeComponent 2017-10-30 03:53:00 -05:00
Jordan Brown
47f88be07f Fixes TakeComponent (#32156)
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
2017-10-30 03:53:00 -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
f1002a7109 Merge pull request #3672 from Citadel-Station-13/upstream-merge-32206
[MIRROR] Fixes map_config validation
2017-10-30 00:00:31 -04:00
LetterJay
1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04: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
LetterJay
3c08b5e4ca Merge pull request #3676 from Citadel-Station-13/upstream-merge-32189
[MIRROR] Makes the atmos table accessible in MetaStation
2017-10-29 23:37:44 -04:00
LetterJay
4d3211f273 Merge pull request #3675 from Citadel-Station-13/upstream-merge-32185
[MIRROR] Fixes TP wizarding.
2017-10-29 23:37:30 -04:00
LetterJay
84272ea241 Merge branch 'master' into upstream-merge-32206 2017-10-29 23:36:39 -04:00
LetterJay
b6f0423840 Update map_config.dm 2017-10-29 22:23:17 -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
a0590a0143 Merge pull request #3671 from Citadel-Station-13/upstream-merge-32217
[MIRROR] Corrects the assmos description in the changelog.
2017-10-29 15:52:34 -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
5a92bafa75 Merge pull request #3670 from Citadel-Station-13/upstream-merge-31966
[MIRROR] Spooky Spectral Instruments
2017-10-29 15:51:17 -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
5210883d3b Merge pull request #3656 from Citadel-Station-13/upstream-merge-32132
[MIRROR] Map config cleanup
2017-10-29 15:49:08 -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
LetterJay
f5abc46e5b Merge pull request #3619 from Citadel-Station-13/upstream-merge-32095
[MIRROR] Removes outdated CC-Related tips
2017-10-29 15:48:12 -04:00
LetterJay
32f96de503 Update tips.txt 2017-10-29 14:48:04 -05:00
KorPhaeron
edfc86c895 Halloween race fixes 2017-10-29 12:31:38 -05:00
CitadelStationBot
d5d9912a75 Adds new valentines; replaces outdated/shitty ones. 2017-10-29 11:04:04 -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
CitadelStationBot
ee22bdef78 Ice Spiders now use frost oil instead of toxin 2017-10-29 11:02:50 -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
CitadelStationBot
178a00ac78 Makes the atmos table accessible in MetaStation 2017-10-29 10:57:34 -05:00
naltronix
98a9c8933f fixes the table (#32189) 2017-10-29 10:57:34 -05:00
CitadelStationBot
f3baef052f Fixes TP wizarding. 2017-10-29 10:37:04 -05:00
Jordan Brown
cab7c8009c Merge pull request #32185 from AnturK/wiztypo
Fixes TP wizarding.
2017-10-29 10:37:03 -05:00
CitadelStationBot
24072bfdd7 Events take pre-game lobby time into account 2017-10-29 10:36:56 -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
Jordan Brown
37fdf365a5 Fixes map_config validation 2017-10-29 10:26:20 -05:00
Jordie
50e014885f Corrects the assmos description in the changelog. 2017-10-29 07:36:28 -05:00
CitadelStationBot
c3f0ae0651 Spooky Spectral Instruments 2017-10-29 07:35:16 -05:00
Mercenaryblue
819244575d Spooky Spectral Instruments (#31966)
* [dooting intensifies]

Spectral Instruments added
To be used with Spooky Skeletons.

* Spectral Re-balance

The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.

* Requested Changes

Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.

* Loyalty text fix

* Spooky Trumpets

Removed comment.
Added missing spookiness.

* Spooky Dooting

Major Overhaul.

removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.

* Spooky Dooting

mk2
2017-10-29 07:35:16 -05:00
CitadelStationBot
573d4b7c38 One more thing to allow more mobs to qdel nicely 2017-10-29 07:14:44 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
CitadelStationBot
f4d4a12f30 Actually fixes meteors, again 2017-10-29 07:13:32 -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
fd2705b6e6 Merge pull request #3667 from Citadel-Station-13/upstream-merge-32141
[MIRROR] Allows RPD to place pipes on catwalks/girders
2017-10-29 04:23:46 -04:00
LetterJay
2b65d6f0cc Merge pull request #3665 from deathride58/fixescrewobjredtext
Fixes certain crew objectives giving out red text
2017-10-29 04:23:35 -04:00