Dahlular
bdd2bbf154
Fixes some missing pipes + radiation closets and rad proofs TEG burn chamber
2021-04-29 22:03:08 -06:00
Dahlular
4150636fa4
Revert "Revert "Merge branch 'master' into cumcom""
...
This reverts commit c2cc5c49c6
2021-04-29 17:46:09 -06:00
Dahlular
c2cc5c49c6
Revert "Merge branch 'master' into cumcom"
...
This reverts commit 05c4645c35d3867f491b
2021-04-29 17:44:13 -06:00
Dahlular
05c4645c35
Merge branch 'master' into cumcom
2021-04-29 17:43:57 -06:00
Dahlular
3cefcf6eb1
Merge remote-tracking branch 'upstream/master'
2021-04-29 17:24:55 -06:00
Dahlular
ad59e6913f
alright, cannot be assed
2021-04-29 16:59:21 -06:00
QuoteFox
803a881da9
bug fix
...
now gibbed people still cause trauma
2021-04-27 20:33:15 +01:00
QuoteFox
5af77b4482
death causes mood debuffs and possible jitterness
...
watching some die is trumatic, and shouldnt be taken lightly. doesnt stack, 20min cool down.
2021-04-27 19:53:18 +01:00
QuoteFox
ec796b47c2
Merge branch 'master' into Kristopher-Uniform-Patreon
2021-04-27 19:28:13 +01:00
QuoteFox
68120e2583
Virile and Macro, Micro traits. Impregnation Chance
...
More lewd code.
2021-04-27 16:55:22 +01:00
QuoteFox
b6b71a5b0f
H.O.N.K mech, admin spawn only.
2021-04-27 00:40:38 +01:00
Chemlight
b6ecf59798
TouchinFuzzy Patreon uniform reward
...
As it says in the title, patreon reward for a high donator
2021-04-26 08:01:17 -07:00
QuoteFox
a1d2ca576f
Hyperbot End of Round Reports
2021-04-26 10:25:48 +01:00
QuoteFox
09a51e20be
Merge pull request #1089 from DragonTrance/xenobio-console
...
i swear to god
2021-04-26 04:35:24 +01:00
DragonTrance
91f8a8eb8a
i swear to god
2021-04-25 11:17:04 -07:00
QuoteFox
17b49ab022
Arousal menu update, Impreg chance
2021-04-25 12:41:15 +01:00
QuoteFox
2fb66c3a67
Merge pull request #1088 from ArchieBeepBoop/sillycons
...
Flavortext... But as an element.
2021-04-23 05:24:19 +01:00
QuoteFox
698b3c12f4
croc snout for lizard people
2021-04-23 02:53:32 +01:00
Archie
143b441b33
Flavortext... But as an element.
2021-04-22 18:36:18 -03:00
QuoteFox
1410e2f206
Merge pull request #1085 from DragonTrance/various-fixes
...
fixes job.after_spawn
2021-04-22 14:48:31 +01:00
QuoteFox
0f0ca5c2c7
Merge pull request #1087 from WTFIsmyname/Old-gibbers-were-better
...
Makes Gibbers Useful.dm
2021-04-22 14:48:08 +01:00
QuoteFox
42cb0fc39d
Update mouse.dm
...
orginal boom mouse health
2021-04-22 14:47:46 +01:00
QuoteFox
defc41b103
Merge pull request #1084 from ArchieBeepBoop/reagentfix4
...
Fixes some rogue reagents.
2021-04-22 14:46:20 +01:00
QuoteFox
a19fb4b9c8
Merge pull request #1086 from DragonTrance/xenobio-console
...
Slime Consoles now have click shortcuts
2021-04-22 14:46:02 +01:00
WTFIsmyname
721ff6c484
Update gibber.dm
2021-04-22 18:03:31 +10:00
DragonTrance
b0acab2ad8
typo
2021-04-22 00:05:03 -07:00
DragonTrance
2de635f4dd
can now click stuff while in slime consoles
2021-04-21 23:48:15 -07:00
DragonTrance
c601163cfa
fixes job.after_spawn
2021-04-21 18:56:01 -07:00
Archie
a297c1be4e
Fixes some rogue reagents
2021-04-21 18:56:13 -03:00
DragonTrance
d76ff71320
Update canister.dm
2021-04-21 14:03:52 -07:00
DragonTrance
2e2e8d2bdf
ghosts can read contents of an air canister + examine meters by clicking
2021-04-21 14:01:32 -07:00
Archie
ca1f4220a9
Reduces boommouse health
2021-04-20 18:38:30 -03:00
QuoteFox
ff7cbf483d
Merge pull request #1079 from DragonTrance/various-fixes
...
Various fixes
2021-04-20 21:41:45 +01:00
QuoteFox
9c61a94d9e
jani sprites, drink sprites, and no super large monkey energry
2021-04-20 21:38:06 +01:00
DragonTrance
42f4fe1721
i probably should resolve conflicts with desktop
2021-04-20 01:18:01 -07:00
DragonTrance
20e2c2fcea
Merge branch 'master' into various-fixes
2021-04-20 00:56:44 -07:00
DragonTrance
b4039d7cbb
various fixes v2
...
1 - Loadout items no longer duplicate backpack items, and all items get stored into backpacks properly
2 - Fixed a runtime with captain's job on roundstart. They will now be announced when they join at the start of the shift.
3 - Fixed filter runtime when transferring ckeys
4 - Economy SS no longer fires, so it will no longer clutter runtime logs
5 - Fixed laughing peas not being able to be taken out of seed extractors by lazily renaming them
2021-04-20 00:52:33 -07:00
QuoteFox
38c83b2039
Merge pull request #1075 from ArchieBeepBoop/synthflesh2
...
Hopefully fixes synthflesh and rezadone.
2021-04-19 21:41:11 +01:00
QuoteFox
1b9267e02d
Merge pull request #1074 from ArchieBeepBoop/aurora
...
Randomizes aurora caelus songs
2021-04-19 21:41:00 +01:00
Archie
0ac9c39d4e
Hopefully fixes synthflesh and rezadone.
2021-04-19 17:39:26 -03:00
QuoteFox
1cb1ae10e2
bug fixes, speed potion and layering
2021-04-19 20:03:41 +01:00
Archie
b1a06d39c6
Randomizes aurora songs once again
2021-04-19 15:44:11 -03:00
Dahlular
50a7413928
Merge remote-tracking branch 'upstream/master'
2021-04-18 23:19:38 -06:00
Dahlular
6c72b0e0e6
Merge remote-tracking branch 'upstream/master' into cumcom
2021-04-18 23:17:45 -06:00
Archie
d89aec9ce1
Random Parallax
2021-04-19 02:08:21 -03:00
Archie
2f7f72ea0e
Archie Fix Pack 1
2021-04-18 21:07:35 -03:00
Dahlular
02dc3abcf6
Merge branch 'master' into stopbeingcringe
2021-04-17 21:26:32 -06:00
Dahlular
c55452bdb8
Disables His Grace, restricts cult items
2021-04-17 21:20:40 -06:00
Dahlular
39d446817b
Merge remote-tracking branch 'upstream/master'
2021-04-17 21:09:59 -06:00
Dahlular
978748b8d8
Merge pull request #1066 from lyricalpaws/master
...
We're off to see the wizard
2021-04-17 21:09:27 -06:00
