Poojawa
|
4fdddc7b4d
|
clears a merge conflict
|
2019-10-17 05:37:44 -05:00 |
|
Poojawa
|
4ee608e0c7
|
Fixes blood transfusion, QOL to IV drippers
|
2019-10-16 09:15:04 -05:00 |
|
Poojawa
|
14e0087fbd
|
blood sorta works again, needs better fixing tho
|
2019-10-16 04:38:31 -05:00 |
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05:00 |
|
kevinz000
|
7187da9e72
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2019-10-15 23:11:35 -07:00 |
|
kevinz000
|
e187f806a0
|
Merge pull request #9479 from lolman360/ltsurge
fixes bug with new surgerytools examine
|
2019-10-15 23:04:15 -07:00 |
|
kevinz000
|
6d1035e995
|
Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
|
2019-10-15 22:59:45 -07: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 |
|
Fermi
|
f587beeef4
|
2 hats and undoes halloween accidental change
|
2019-10-15 22:56:42 +01: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 |
|
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 |
|
deathride58
|
ffa7898f45
|
Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
|
2019-10-15 06:19:26 -04:00 |
|
Thalpy
|
1eccc93137
|
Oh it's so good
|
2019-10-15 10:44:35 +01:00 |
|
Thalpy
|
1b170fe2b7
|
Costume for meee
|
2019-10-15 10:27:31 +01:00 |
|
Putnam
|
ee20e23777
|
made beaker spawn on pandemic if hands are full
|
2019-10-14 19:48:20 -07:00 |
|
lolman360
|
140306a97f
|
Update tools.dm
|
2019-10-15 13:25:41 +11:00 |
|
deathride58
|
6245d5df30
|
Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
|
2019-10-14 14:16:46 -04:00 |
|
Poojawa
|
dad9f7f6ce
|
Helping edgecase things
|
2019-10-13 19:41:46 -05:00 |
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
Poojawa
|
fad517fccb
|
oh let's unsnowflake this one too I guess
|
2019-10-13 19:06:46 -05:00 |
|
Poojawa
|
198f2b7add
|
Fixes missing decorative wing states
|
2019-10-13 19:02:28 -05:00 |
|
Thalpy
|
e7c5e74d3a
|
Hopefully no break
|
2019-10-13 23:41:06 +01:00 |
|
Ghommie
|
ff3972247a
|
Fixes some missing species_traits for cloth, clockwork and cult golems.
|
2019-10-13 23:40:52 +02:00 |
|
Thalpy
|
ac2aba50a6
|
Turns Jacq into her own event
|
2019-10-13 22:33:46 +01: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 |
|
kevinz000
|
48e4187cef
|
Merge pull request #9461 from r4d6/master
Adding Decorative Wings
|
2019-10-13 14:00:07 -07: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 |
|
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 |
|
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 |
|
kevinz000
|
adeb33cdae
|
Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
|
2019-10-13 13:54:26 -07:00 |
|
Thalpy
|
356a1279f1
|
Adds vars for the ball.
|
2019-10-13 20:06:40 +01:00 |
|
lolman360
|
3211138a75
|
wwwwwwww
|
2019-10-13 18:07:25 +11:00 |
|
Ghommie
|
c78078bdd4
|
typo
|
2019-10-13 06:08:53 +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 |
|
Putnam
|
7003080440
|
Merge branch 'master' into fix-nanites
|
2019-10-12 02:36:51 -07:00 |
|
Fermi
|
ecfc988911
|
Okay!
|
2019-10-12 09:15:32 +01:00 |
|
Fermi
|
2a6b84151e
|
Removed something I didn't mean to
|
2019-10-12 07:59:44 +01:00 |
|
Putnam
|
c389099a47
|
Makes brain-healing nanites not work uselessly
|
2019-10-11 23:58:34 -07:00 |
|
Fermi
|
2e03985696
|
aaaa
|
2019-10-12 07:55:19 +01:00 |
|
Fermi
|
f922a3dda5
|
Fast!!
|
2019-10-12 07:18:39 +01:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05: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 |
|