kevinz000
|
14d763bd1d
|
Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
|
2019-05-31 17:46:44 -07:00 |
|
kevinz000
|
8c6d8eb20b
|
Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
|
2019-05-31 17:45:07 -07:00 |
|
kevinz000
|
07d3b0361c
|
Merge pull request #8466 from Poojawa/vis-overlay-insolence
Fixes atmos and station alert consoles not updating visually
|
2019-05-31 17:44:39 -07:00 |
|
kevinz000
|
854eb129f6
|
Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
|
2019-05-31 17:43:53 -07:00 |
|
kevinz000
|
1efdfd38e0
|
Merge pull request #8436 from Trilbyspaceclone/patch-137
Allows bio genes to make synth meat
|
2019-05-31 17:43:22 -07:00 |
|
kevinz000
|
f678741a0e
|
Merge pull request #8470 from Ghommie/Ghommie-cit19
Undunks pepper spray & teargas.
|
2019-05-31 17:42:28 -07:00 |
|
kevinz000
|
ca16cd9467
|
Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
|
2019-05-31 17:41:39 -07:00 |
|
kevinz000
|
a96e414d2f
|
Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
|
2019-05-31 17:40:30 -07:00 |
|
Fermi
|
2eceb6f57b
|
Added a cybernetic tongue and sprites. Fixed furranium.
|
2019-06-01 01:28:52 +01:00 |
|
Fermi
|
abfcc25e91
|
No changed, just staching a comment.
|
2019-05-31 23:54:30 +01:00 |
|
Trilbyspaceclone
|
9badda96d8
|
huh
|
2019-05-31 18:04:02 -04:00 |
|
Trilbyspaceclone
|
5e67974611
|
old file fixing
|
2019-05-31 18:01:22 -04:00 |
|
Trilbyspaceclone
|
aaaebe625b
|
old file fixes
|
2019-05-31 18:00:00 -04:00 |
|
Trilbyspaceclone
|
3891cf1ff6
|
Update sheet_types.dm
|
2019-05-31 17:54:49 -04:00 |
|
Trilbyspaceclone
|
96a32f7c3d
|
Update boxes.dm
|
2019-05-31 17:53:54 -04:00 |
|
Trilbyspaceclone
|
ddfe9812a1
|
Update shotgun.dm
|
2019-05-31 16:06:26 -04:00 |
|
BlackMajor
|
46123cb1fa
|
First attempt at making size change damage (doesn't work yet)
|
2019-06-01 02:45:14 +12:00 |
|
BlackMajor
|
2b1931c217
|
Compression kit can now shrink dicks. Also gives it way more feedback.
|
2019-06-01 00:42:40 +12:00 |
|
BurgerLua
|
5f94441cc7
|
Adds Clockwork Reflectors
|
2019-05-30 22:52:43 -07:00 |
|
Fermi
|
e1577111a0
|
TO BE TESTED: Added the ability for slimes to make MKUltra.
|
2019-05-31 05:09:07 +01:00 |
|
Fermi
|
d0811e5be6
|
Adjusted lung health.
|
2019-05-31 04:26:41 +01:00 |
|
Fermi
|
adeffe0c47
|
Fixed lungs.
|
2019-05-31 04:16:18 +01:00 |
|
Fermi
|
08e72ba05e
|
Why does adjustLungLoss not workkkkkkkkkkkkkkkkk
|
2019-05-31 03:49:25 +01:00 |
|
Fermi
|
1461f46292
|
Added a catch to prevent acid from being rascals.
|
2019-05-31 03:12:00 +01:00 |
|
Fermi
|
f8005dd625
|
Moved the secret cat to the respective fermi.dms.
|
2019-05-31 02:47:08 +01:00 |
|
BurgerLua
|
5dc3542f90
|
added
|
2019-05-30 15:49:53 -07:00 |
|
Trilbyspaceclone
|
c73884aea4
|
huh...
|
2019-05-30 16:12:40 -04:00 |
|
Trilbyspaceclone
|
751b9adb53
|
Update recipes.dm
|
2019-05-30 16:10:10 -04:00 |
|
Fermi
|
ee2d75ae22
|
Removed special screen obj, as I didn't like how they looked.
|
2019-05-30 20:05:06 +01:00 |
|
Trilbyspaceclone
|
5d80fb6811
|
Update backpack.dm
|
2019-05-30 15:04:45 -04:00 |
|
Ghommie
|
fa4cf533cb
|
honestly AP bullet spam is ballocks too.
|
2019-05-30 20:20:05 +02:00 |
|
kevinz000
|
f5b3484e92
|
Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
|
2019-05-30 11:12:35 -07:00 |
|
Ghommie
|
85ab988842
|
0, null, and "", all fulfill the ! operator.
|
2019-05-30 20:09:19 +02:00 |
|
Trilbyspaceclone
|
a8ec60d9c1
|
Update miscellaneous.dm
|
2019-05-30 13:51:55 -04:00 |
|
kevinz000
|
e75e629a8a
|
Update code/modules/antagonists/changeling/powers/adrenaline.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-30 10:32:02 -07:00 |
|
SkullyRoberts
|
5482469a86
|
Added lightup shoes and heelys to maint loot
|
2019-05-30 13:02:18 -04:00 |
|
Coolgat3
|
674e8a4227
|
Glubbs
|
2019-05-30 18:59:43 +02:00 |
|
Trilbyspaceclone
|
39700503f9
|
Update miscellaneous.dm
|
2019-05-30 11:40:37 -04:00 |
|
Trilbyspaceclone
|
618c2c070c
|
Update ert.dm
|
2019-05-30 11:36:20 -04:00 |
|
Trilbyspaceclone
|
0eb468e3a5
|
Update ert.dm
|
2019-05-30 11:33:38 -04:00 |
|
Trilbyspaceclone
|
a6e85a63ba
|
Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
|
2019-05-30 11:14:31 -04:00 |
|
kevinz000
|
46c548272c
|
move stuff
|
2019-05-29 23:14:55 -07:00 |
|
BlackMajor
|
0d06605662
|
Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
|
2019-05-30 16:17:33 +12:00 |
|
BlackMajor
|
4cfb473e3a
|
Update
Fixes merge conflict with gangs.
Adds a little feedback.
Fixes crystal eating.
|
2019-05-30 12:23:57 +12:00 |
|
Useroth
|
d8d9d6efeb
|
Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes.
|
2019-05-29 23:45:25 +02:00 |
|
Trilbyspaceclone
|
027ee1e596
|
Update plushes.dm
|
2019-05-29 16:40:41 -04:00 |
|
Thalpy
|
a58766c885
|
Fixed explosions not occuring when temps were high enough.
|
2019-05-29 21:11:21 +01:00 |
|
Thalpy
|
90949f406d
|
Fixed the forceMove issue.
|
2019-05-29 20:17:22 +01:00 |
|
Thalpy
|
71eb285472
|
Few tweaks and fixes to last commits.
|
2019-05-29 20:04:52 +01:00 |
|
Thalpy
|
6117e3a6aa
|
Fixes to the hypnoflash,
|
2019-05-29 19:09:40 +01:00 |
|