Commit Graph

24411 Commits

Author SHA1 Message Date
CitadelStationBot
2ddb69a135 Automatic changelog generation for PR #9499 [ci skip] 2019-10-16 00:57:04 -05:00
kevinz000
11a93d41de Merge pull request #9499 from r4d6/patch-1
Add a Blindfold to the loadout list
2019-10-15 22:57:02 -07:00
CitadelStationBot
6be80aedbe Automatic changelog generation for PR #9502 [ci skip] 2019-10-16 00:53:46 -05:00
kevinz000
3d5facdea5 Merge pull request #9502 from Putnam3145/pandemic-qol2
Makes beaker spawn on pandemic instead of on user when hands full
2019-10-15 22:53:44 -07:00
CitadelStationBot
26617ba780 Automatic changelog generation for PR #9472 [ci skip] 2019-10-15 05:33:02 -05:00
deathride58
9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
2019-10-15 06:32:59 -04:00
CitadelStationBot
6d7643085b Automatic changelog generation for PR #9493 [ci skip] 2019-10-15 05:28:00 -05:00
deathride58
26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234
SDGF ghost poll message made terse, other tweaks.
2019-10-15 06:27:58 -04:00
CitadelStationBot
2ce654fe2e Automatic changelog generation for PR #9488 [ci skip] 2019-10-15 05:20:45 -05:00
deathride58
df17f34eb6 Merge pull request #9488 from Ghommie/Ghommie-cit231
Adds some missing species_traits for cloth, clockwork and cult golems.
2019-10-15 06:20:43 -04:00
CitadelStationBot
93b8c6b73d Automatic changelog generation for PR #9478 [ci skip] 2019-10-15 05:19:29 -05:00
deathride58
ffa7898f45 Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
2019-10-15 06:19:26 -04:00
CitadelStationBot
ac1dc69523 Automatic changelog generation for PR #9489 [ci skip] 2019-10-15 05:17:41 -05:00
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
Putnam
ee20e23777 made beaker spawn on pandemic if hands are full 2019-10-14 19:48:20 -07:00
deathride58
6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
r4d6
a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Ghommie
321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie
3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02: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
Ghommie
ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +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
Putnam
1b97c50ef7 Makes pod people not constantly slightly fat 2019-10-12 17:50:51 -07:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Thalpy
3f16c287a9 I'm big silly 2019-10-12 13:40:40 +01:00
Thalpy
82446681bf Everything is pain 2019-10-12 13:22:05 +01:00
Thalpy
d94f796ffb aaaa 2019-10-12 12:42:51 +01:00