Hatterhat
|
ff8a86d05a
|
squashing is hell but orm lasers work
|
2019-12-30 23:50:49 -06:00 |
|
Lin
|
b3144c7570
|
Merge pull request #10365 from Putnam3145/fix-prefs
[s] prefs broke i fix
|
2019-12-31 04:12:55 +00:00 |
|
Putnam
|
0b60b121c2
|
afwafwadjiwao
|
2019-12-30 19:34:57 -08:00 |
|
kevinz000
|
79c609aa40
|
Update telescopic_iv.dm
|
2019-12-30 17:55:59 -08:00 |
|
Arturlang
|
c4caa54608
|
Oh god oh fuck
|
2019-12-31 03:23:14 +02:00 |
|
nik707
|
70d03a7870
|
Merge pull request #10344 from Ghommie/Ghommie-cit495
chestbursters deleting brains fix.
|
2019-12-30 18:31:34 -06:00 |
|
nik707
|
5c13fa64e3
|
Merge pull request #10338 from Seris02/marshmallow
marshmallow
|
2019-12-30 18:31:06 -06:00 |
|
nik707
|
8a4e44758f
|
Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
|
2019-12-30 18:28:48 -06:00 |
|
nik707
|
23f79ffed8
|
Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
throwing now only randomly turns things if you are on harm intent
|
2019-12-30 18:28:16 -06:00 |
|
Ghom
|
775ddb61e6
|
Merge pull request #10301 from Trilbyspaceclone/patch-249
Buffs Engine Goggles a lot!
|
2019-12-30 22:23:46 +01:00 |
|
Putnam
|
d78ebd15f3
|
amazing.
|
2019-12-30 12:38:38 -08:00 |
|
Ghom
|
d3bf4bbb8c
|
Merge pull request #10306 from Arturlang/patch-2
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
|
2019-12-30 20:11:34 +01:00 |
|
Arturlang
|
0776cade21
|
Ghommies fixes
|
2019-12-30 20:18:49 +02:00 |
|
Ghom
|
e309497af2
|
Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
|
2019-12-30 18:24:50 +01:00 |
|
Seris02
|
f0ba93052d
|
yee2.
|
2019-12-30 23:53:10 +08:00 |
|
Seris02
|
bebd1a4600
|
yee.
|
2019-12-30 23:52:36 +08:00 |
|
Seris02
|
9653dc470b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
|
2019-12-30 22:48:39 +08:00 |
|
Seris02
|
8bb7a4a40d
|
hnnnng
|
2019-12-30 19:24:07 +08:00 |
|
Seris02
|
bc2e4f3b5a
|
desc
|
2019-12-30 19:08:37 +08:00 |
|
Ghom
|
20de4dfe50
|
Merge pull request #10333 from Trilbyspaceclone/patch-255
Makes grass distill into light beer
|
2019-12-30 11:18:20 +01:00 |
|
Ghom
|
6e506c949e
|
Merge pull request #10348 from Putnam3145/radiation
fix divide by 0 runtime in new contam
|
2019-12-30 11:08:52 +01:00 |
|
Ghom
|
a6e72c8cad
|
ok
|
2019-12-30 11:00:21 +01:00 |
|
Trilbyspaceclone
|
24d4684afb
|
Maybe he means this?
|
2019-12-30 03:56:44 -05:00 |
|
kevinz000
|
fef66b1bd7
|
Merge pull request #10320 from Seris02/exclusion
excludes certain ghost roles from being affected by health events
|
2019-12-30 00:26:19 -08:00 |
|
kevinz000
|
eb00538843
|
Merge pull request #10331 from Trilbyspaceclone/patch-254
Buffs borg hypo's
|
2019-12-30 00:20:35 -08:00 |
|
kevinz000
|
ae77577ed3
|
Merge pull request #10239 from Ghommie/Ghommie-cit480
Fixing a few consistency issues with Nightmares.
|
2019-12-30 00:15:03 -08:00 |
|
kevinz000
|
97aadba950
|
Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks
Revert "Makes HE pipes realistically radiate away heat"
|
2019-12-30 00:13:45 -08:00 |
|
kevinz000
|
80606f42ac
|
Merge pull request #10334 from keronshb/REFLECTORBLOBPORT
Ports reflector blobs
|
2019-12-30 00:11:50 -08:00 |
|
kevinz000
|
d1434c767c
|
Merge pull request #10335 from kappa-sama/patch-12
mouth slice
|
2019-12-30 00:11:38 -08:00 |
|
kevinz000
|
0dc55b209a
|
Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix
Fixes UI for poly collars
|
2019-12-30 00:11:27 -08:00 |
|
kevinz000
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
kevinz000
|
3f4594d78e
|
Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
|
2019-12-30 00:07:32 -08:00 |
|
kevinz000
|
47c92e380c
|
Merge branch 'master' into throwing_disarm_stuff
|
2019-12-30 00:05:17 -08:00 |
|
kevinz000
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
Putnam
|
1b7e9c6716
|
wow divide by 0 very cool
|
2019-12-29 22:03:23 -08:00 |
|
Putnam3145
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
Seris02
|
40730b48d5
|
few fixes
|
2019-12-30 11:49:16 +08:00 |
|
Seris02
|
f1292c503c
|
makes it a trait
|
2019-12-30 11:33:15 +08:00 |
|
Ghommie
|
87cca7a649
|
...which var are you?
|
2019-12-30 01:05:54 +01:00 |
|
Ghommie
|
8a32b89f17
|
Wait a minute...
|
2019-12-30 01:05:21 +01:00 |
|
Ghommie
|
55cb844bc2
|
chestbursters deleting brains fix.
|
2019-12-30 01:00:36 +01:00 |
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
Trilbyspaceclone
|
1cc4464726
|
Update engine_goggles.dm
|
2019-12-29 15:01:02 -05:00 |
|
Trilbyspaceclone
|
ee7346f280
|
got it
|
2019-12-29 15:00:33 -05:00 |
|
Trilbyspaceclone
|
a2b79e043f
|
Update code/modules/hydroponics/grown/grass_carpet.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-29 14:57:22 -05:00 |
|
Ghom
|
d1a4bf6895
|
Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
|
2019-12-29 17:30:59 +01:00 |
|
Ghom
|
b549670e39
|
Merge pull request #10324 from Trilbyspaceclone/patch-253
Honey no longer murders slimes
|
2019-12-29 17:24:19 +01:00 |
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +08:00 |
|
Seris02
|
9b3654e4ff
|
telescopic IVs
|
2019-12-29 23:26:53 +08:00 |
|
Seris02
|
a39c0249c4
|
marshmallow
|
2019-12-29 21:55:25 +08:00 |
|