b7c69b4af5
SSD miasma v3
2019-02-09 08:56:58 -05:00
ec71ef63de
carbon human only
2019-02-08 19:55:21 -05:00
c1c2e40ecd
Better SSD miasma
2019-02-08 19:50:43 -05:00
ab2babc34c
SSD miasma
2019-02-08 19:06:04 -05:00
3aeb1d861c
Merge pull request #10831 from Shadeykins/FoodDescriptions
...
Tweaks some food descriptions/casing.
2019-02-08 19:31:34 +08:00
03f172eff8
stat, change way drone dies
2019-02-07 20:04:39 +01:00
8b666c84c1
fluff suit
2019-02-07 03:52:55 +01:00
89b9725766
Sorry Citined :(
2019-02-06 18:42:56 -07:00
1818fd0679
Capital S.
2019-02-05 19:58:40 -07:00
cda4d7b8d1
Missed some heresy.
2019-02-05 19:57:55 -07:00
25cf6b60bf
donk pocket
2019-02-05 19:57:19 -07:00
32085e5641
Fixes spaghatt
2019-02-05 19:55:43 -07:00
e80ea2bbe9
Standardizes casing on drinks.
2019-02-05 19:51:54 -07:00
a9e7267994
Fixes some casing.
2019-02-05 19:34:35 -07:00
00f97469ba
CS.
2019-02-05 16:32:43 -07:00
5bda717d37
casing/descriptions
2019-02-05 16:29:41 -07:00
3435408a1f
Merge pull request #10826 from lass9030/sorium-ldm_move-resist_check
...
Makes vortex chems check for moveresist
2019-02-05 10:18:33 +08:00
5021d5cb27
Merge pull request #10824 from Kyep/slime_emoting
...
fixes slime emote runtime
2019-02-05 10:18:23 +08:00
ce06589c2a
checks for moveresist
2019-02-04 22:26:05 +01:00
e1fb83f6b6
fixes slime emote runtime
2019-02-04 07:52:26 -08:00
ecd8f80af4
Merge pull request #10820 from MINIMAN10000/fuel-bomb-fix
...
Boom function now checks for fuel before fuel tank boom.
2019-02-03 17:22:16 +08:00
516b7e0144
Boom function now checks for fuel before fuel tank boom.
2019-02-03 00:53:46 -08:00
e7d729b074
Merge pull request #10817 from taukausanake/pai_light
...
Pai light
2019-02-03 14:26:46 +08:00
efa598cfd0
Merge pull request #10800 from Fox-McCloud/no-breathe-no-talk
...
Lack of Breath Incurs Silence
2019-02-03 13:25:06 +08:00
f3c44848e2
Applies latest requests
...
I _think_ these resolve what was left in the last PR. Been a while since
I last did this
Changes to be committed:
modified: code/modules/mob/living/silicon/pai/software_modules.dm
2019-02-02 23:16:30 -06:00
b7ce683ab1
Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light
...
Conflicts:
code/game/gamemodes/shadowling/shadowling_abilities.dm
code/game/objects/items/devices/flashlight.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
Changes to be committed:
modified: code/game/gamemodes/shadowling/shadowling_abilities.dm
modified: code/game/machinery/computer/computer.dm
modified: code/game/machinery/floodlight.dm
modified: code/game/objects/items/devices/flashlight.dm
modified: code/game/objects/items/devices/paicard.dm
modified: code/modules/clothing/head/hardhat.dm
modified: code/modules/clothing/spacesuits/hardsuit.dm
modified: code/modules/clothing/spacesuits/plasmamen.dm
modified: code/modules/lighting/lighting_atom.dm
modified: code/modules/mob/living/carbon/human/human.dm
modified: code/modules/mob/living/living.dm
modified: code/modules/mob/living/silicon/pai/pai.dm
modified: code/modules/mob/living/silicon/pai/software_modules.dm
modified: code/modules/mob/living/silicon/robot/robot.dm
modified: code/modules/pda/PDA.dm
modified: code/modules/power/lighting.dm
modified: code/modules/projectiles/gun.dm
2019-02-02 22:53:46 -06:00
b1c1e71f23
Merge pull request #10813 from Fox-McCloud/skittles-fluff
...
Skittles Fluff Item--Kiachi
2019-02-03 10:13:32 +08:00
5fce6edc0d
Skittles Fluff Item--Kiachi
2019-02-02 18:52:43 -05:00
58e3c95c81
Merge pull request #10778 from MINIMAN10000/helpful-push
...
Mobs on help intent no longer push structures or mobs that are pulling structures
2019-02-02 21:05:00 +08:00
47d81908fd
Merge pull request #10798 from TDSSS/second-mob-spawner-fix
...
Fixed mob spawner menu, this time for real
2019-02-02 21:03:23 +08:00
30f7f623de
Merge pull request #10802 from Kyep/playtime_panel_redux
...
Updates player playtime report
2019-02-02 20:54:00 +08:00
08e5b5d484
fixed spacing
2019-02-02 13:52:25 +01:00
7c57d652e1
Fixed non-breating mobs adding to germ_level in surgery.
2019-02-02 13:40:05 +01:00
00187ad971
Updates show player playtime report
2019-02-01 23:46:29 -08:00
b02ffcd6a8
Lack of Breath Incurs Silence
2019-02-02 00:15:52 -05:00
990b05b4ef
Fixed mob spawner menu, this time for real
2019-02-02 05:08:02 +01:00
f9aa125eb5
Merge pull request #10796 from Citinited/sexy-clowns-oh-god
...
Repaths sexy clown stuff to be subtypes of the existing clown items
2019-02-01 17:48:18 -05:00
41ac5e0027
Repath of sexy clown gear: part 1
2019-02-01 21:46:58 +00:00
8e0f0761ea
Merge pull request #10785 from AffectedArc07/changelog-button-fix
...
Darkmode fixes
2019-02-01 10:41:21 +08:00
d382fa1c7c
Merge pull request #10761 from datlo/agentidfixes
...
Refactors agent ID phototaking, misc ID fixes/improvements
2019-02-01 10:17:08 +08:00
913c2061c0
dont_save
2019-01-31 12:10:28 -05:00
1b08c7a43c
Unbreaks wingdings
...
Jestosterone PR accidentally removed the check for wingdings mutation.
this re-adds it.
2019-01-31 14:26:09 +00:00
d26a08e373
Merge pull request #10768 from datlo/itspaydayfellas
...
Updates syndi kits, add armored suit jacket
2019-01-31 11:30:27 +08:00
e19b61662f
Merge pull request #10736 from datlo/ghettosurgeryfix
...
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
2019-01-31 11:29:09 +08:00
dfdd9ce8a0
Merge pull request #9705 from Kyep/ts_move_speed_fix
...
Terror spider speed settings now respected when under player control
2019-01-31 11:26:37 +08:00
2cff4b35c5
Merge pull request #10777 from Kyep/admin_room_fix
...
Fixes blast door buttons, refactors buttons to remove range var
2019-01-31 11:04:45 +08:00
21cc9d882f
Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE
...
I JUST CONFLICTED EVERYTHING
2019-01-31 11:03:33 +08:00
110d3b17b4
Revert "Discord Bot Functionality"
2019-01-30 21:19:33 -05:00
afc6ad524f
DMI File Casing Rename
2019-01-30 20:09:39 -05:00
2d4dfb55b7
Darkmode fixes
2019-01-30 17:34:12 +00:00
Ty-Omaha