Commit Graph

24386 Commits

Author SHA1 Message Date
deathride58 af39f679a7 Merge pull request #9489 from Ghommie/Ghommie-cit232
Ports slighty improved drink sprites
2019-10-15 06:17:39 -04:00
CitadelStationBot 70a0006cee Automatic changelog generation for PR #9492 [ci skip] 2019-10-15 05:16:19 -05:00
deathride58 c06c0b9574 Merge pull request #9492 from Ghommie/Ghommie-cit233
Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype.
2019-10-15 06:16:17 -04:00
deathride58 986de09693 Merge pull request #9490 from Citadel-Station-13/headswap
changes donator item from glasses to a hat
2019-10-15 06:12:34 -04:00
deathride58 6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
Ghommie e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Jay 02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Ghommie e65e11b2f6 Ports "drinksprites" 2019-10-14 00:25:38 +02:00
CitadelStationBot 304eae3407 Automatic changelog generation for PR #9339 [ci skip] 2019-10-13 16:00:54 -05:00
kevinz000 4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
2019-10-13 14:00:52 -07:00
CitadelStationBot bd12f2336c Automatic changelog generation for PR #9461 [ci skip] 2019-10-13 16:00:10 -05:00
kevinz000 48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
kevinz000 1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230
Update granters.dm
2019-10-13 13:58:03 -07:00
CitadelStationBot c9960cdcb0 Automatic changelog generation for PR #9416 [ci skip] 2019-10-13 15:56:05 -05:00
kevinz000 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
CitadelStationBot ea44c60923 Automatic changelog generation for PR #9464 [ci skip] 2019-10-13 15:55:23 -05:00
kevinz000 3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
2019-10-13 13:55:21 -07:00
CitadelStationBot 9e944bffb8 Automatic changelog generation for PR #9474 [ci skip] 2019-10-13 15:55:07 -05:00
kevinz000 064e6980f9 Merge pull request #9474 from Putnam3145/fix-nanites
Makes neural nanite programs not drain nanites on things they can't fix
2019-10-13 13:55:05 -07:00
CitadelStationBot 1332c15087 Automatic changelog generation for PR #9463 [ci skip] 2019-10-13 15:54:27 -05:00
kevinz000 adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
2019-10-13 13:54:26 -07:00
CitadelStationBot 89f39a8ddb Automatic changelog generation for PR #9473 [ci skip] 2019-10-13 15:46:42 -05:00
kevinz000 32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing
Set clockcult teleport in Captain's Quarters to false.
2019-10-13 13:46:40 -07:00
kevinz000 3cd99dff1e Merge pull request #9438 from Ghommie/Ghommie-cit222
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
2019-10-13 08:06:40 -07:00
Ghommie c78078bdd4 typo 2019-10-13 06:08:53 +02:00
Ghommie 7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
deathride58 0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Putnam 7003080440 Merge branch 'master' into fix-nanites 2019-10-12 02:36:51 -07:00
Persi db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04:00
Putnam c389099a47 Makes brain-healing nanites not work uselessly 2019-10-11 23:58:34 -07:00
kevinz000 076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000 8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
kevinz000 5cf627e889 Update computer.dm 2019-10-11 20:43:36 -07:00
kevinz000 f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
kevinz000 e600b59217 Update computer.dm 2019-10-11 20:42:01 -07:00
CitadelStationBot f57fa7f471 Automatic changelog generation for PR #9467 [ci skip] 2019-10-11 14:34:27 -05:00
kevinz000 d33b866805 Merge pull request #9467 from deathride58/compscithree
[s] fixes client analyzation having cid and ip swapped
2019-10-11 12:34:25 -07:00
kevinz000 a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227
Fixing a runtime when examining unloaded cit hyposprays.
2019-10-11 12:16:50 -07:00
deathride58 a2f5395b39 [s] fixes the client analyzation having cid and ip swapped 2019-10-11 15:16:35 -04:00
kevinz000 46994f2475 Merge pull request #9448 from MrJWhit/zombie-eyes
Makes zombie smell through their eyes
2019-10-11 12:16:06 -07:00
CitadelStationBot 97964a9fe8 Automatic changelog generation for PR #9374 [ci skip] 2019-10-11 14:13:51 -05:00
kevinz000 b56563fcfe Merge pull request #9374 from kappa-sama/walktime
ashwalkers now have more messages telling them to not go on station
2019-10-11 12:13:49 -07:00
CitadelStationBot 65db48f619 Automatic changelog generation for PR #9450 [ci skip] 2019-10-11 14:13:22 -05:00
kevinz000 e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
2019-10-11 12:13:19 -07:00
CitadelStationBot a5da73edd1 Automatic changelog generation for PR #9386 [ci skip] 2019-10-11 14:13:06 -05:00
kevinz000 bcc92d234b Merge pull request #9386 from Sishen1542/suitrad
Gives suit storage units the ability to remove radiation from mobs
2019-10-11 12:13:04 -07:00
CitadelStationBot 4eb7f90eb2 Automatic changelog generation for PR #9387 [ci skip] 2019-10-11 14:11:52 -05:00
kevinz000 0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
kevinz000 62e11c79b4 Merge pull request #9403 from Poojawa/patch-3
Updates Config with Citadel specific links & info
2019-10-11 12:11:19 -07:00