Commit Graph

6191 Commits

Author SHA1 Message Date
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
silicons
3cae7df6c8 Merge pull request #15002 from keronshb/plaguerats
Plague Rats
2021-08-26 21:41:07 -07:00
silicons
13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons
2c69193337 Merge pull request #15037 from DeltaFire15/corpse-fix
Fixes demons scattering dropped bodies all over the station, plus space dragon content ejection
2021-08-26 21:38:29 -07:00
zerothebigboy
dec2ea645e nuts 2021-08-26 22:57:22 -04:00
DeltaFire
e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire
c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00
DeltaFire
38aa220e6a no nullijng allowed 2021-08-26 04:02:22 +02:00
DeltaFire
f8866774aa no scattering 2021-08-26 03:30:51 +02:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
keronshb
0b8221c9ac Change to 20 minutes 2021-08-19 22:49:19 -04:00
keronshb
1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
WanderingFox95
888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
keronshb
45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
WanderingFox95
4a78d8a880 Separates the tails. 2021-08-15 02:21:09 +02:00
keronshb
5395a78410 Fixes linter 2021-08-12 13:24:31 -04:00
keronshb
bf17f3c4ea Plague Rats
Here they come.
2021-08-12 12:56:33 -04:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
Lin
2ac89f4c12 Merge pull request #14989 from timothyteakettle/markings-for-all-i-guess
lets felinids, humans and moths have markings
2021-08-10 13:37:17 -05:00
Artur
c7a17b0e84 Didn't properly renamy my var 2021-08-10 20:15:07 +03:00
Artur
09227544be Name's too similar 2021-08-10 15:00:54 +03:00
Artur
0ff2e0cee5 makes the amount of integrated_blood lost equal to the blood_volume gained 2021-08-10 15:00:12 +03:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
timothyteakettle
33e1ac1308 Update bugmen.dm 2021-08-07 22:30:43 +01:00
timothyteakettle
9b3a3d81d3 yes 2021-08-07 22:18:06 +01:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
BlueWildrose
0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
Artur
6b5bdae184 salglu works like normal now again and adds more sanity 2021-07-29 23:55:27 +03:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145
cd2a710a23 there's too many errors caused by these two 2021-07-25 19:36:23 -07:00
Lin
0066fc6755 Merge pull request #14959 from Citadel-Station-13/table-floodfills
rewrites subtler_around_table to be slightly cleaner and (probably) work?
2021-07-25 13:56:35 -07:00
Artur
67de120624 Replaces a few more direct blood refillers 2021-07-23 18:58:42 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
1044ea6ae9 Update say_vr.dm 2021-07-20 18:00:36 -07:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
bb337b92dd Merge pull request #14946 from timothyteakettle/cow-tail
anthros can now select the cow tail
2021-07-18 15:07:36 -07:00
silicons
7cd89978f2 Merge pull request #14933 from keronshb/stripdcport
[PORT]  Stripping a disconnected player will tell them when they come back (+Lazynull)
2021-07-18 15:05:48 -07:00
Timothy Teakettle
e9c7d61dc3 Update tails.dm 2021-07-15 19:13:56 +01:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
daf837f89e Merge pull request #14924 from Citadel-Station-13/restraints
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
2021-07-12 00:03:39 -07:00
Lin
3b1bef2729 Merge pull request #14922 from Putnam3145/remove-dirt-buildup
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693 yes 2021-07-10 22:53:14 -07:00
keronshb
c7d1c9d8e8 Ports Stripping log when dc'd 2021-07-07 21:12:44 -04:00
DeltaFire
dd71d12359 aaaaaaaaa 2021-07-05 15:28:39 +02:00
silicons
18fb23bb1f Update carbon.dm 2021-07-04 18:19:31 -07:00