kappa-sama
|
cbf02e76a4
|
fixes cringe
why is this broken and who added this
|
2019-10-16 19:47:14 -04:00 |
|
kevinz000
|
994bfddc1b
|
Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
|
2019-10-16 12:44:34 -07: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 |
|
Thalpy
|
4b069afb42
|
Scrub a dub dub
|
2019-10-15 08:42:40 +01:00 |
|
Thalpy
|
91762d7c65
|
Cleanup
|
2019-10-15 08:22:53 +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 |
|
Fermi
|
a80b5c8a84
|
Autosurgies
|
2019-10-14 13:39:39 +01:00 |
|
Fermi
|
8ddd5402fe
|
Mobcheck
|
2019-10-14 13:35:42 +01:00 |
|
Fermi
|
7b2c8e58ff
|
Fixes freezing and ghost rider
|
2019-10-14 13:23:39 +01: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
|
8a5562e92e
|
Ghmoneie
|
2019-10-13 23:56:18 +01:00 |
|
Thalpy
|
924fa50659
|
Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-10-13 23:55:42 +01:00 |
|
Thalpy
|
094221f4ae
|
IndenettSADgsdfafhfdnfzbdf
|
2019-10-13 23:52:34 +01:00 |
|
Thalpy
|
7973347bf3
|
indent
|
2019-10-13 23:50:25 +01:00 |
|
Thalpy
|
1621c4c7d4
|
stupid bitflags
|
2019-10-13 23:50:08 +01: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
|
6a74bf7093
|
Removes pointless line
|
2019-10-13 22:35:43 +01: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 |
|
Thalpy
|
a13218b99a
|
Fixes Coronary and Lipo
|
2019-10-13 17:23:49 +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 |
|
Thalpy
|
3b8ea30d9b
|
I did it
|
2019-10-12 20:06:46 +01:00 |
|
Thalpy
|
f6796b93b3
|
Fixes graft
|
2019-10-12 18:22:48 +01:00 |
|
Thalpy
|
04b40fd557
|
Tongues decay slower.
|
2019-10-12 18:01:02 +01:00 |
|
Thalpy
|
96d5a0f74c
|
Heart decay
|
2019-10-12 18:00:34 +01:00 |
|
Thalpy
|
7ad16947a7
|
Cleanups
|
2019-10-12 18:00:16 +01:00 |
|
deathride58
|
0c8b82168d
|
Merge branch 'master' into Ghommie-cit222
|
2019-10-12 11:20:32 -04:00 |
|
Thalpy
|
cbc20d33d5
|
Phew
|
2019-10-12 15:13:18 +01:00 |
|
Thalpy
|
3f16c287a9
|
I'm big silly
|
2019-10-12 13:40:40 +01:00 |
|