Commit Graph

6174 Commits

Author SHA1 Message Date
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
silicons
2b1aa8a6fc Merge pull request #14911 from Putnam3145/euclidean-diagonals
Makes diagonal movement euclidean
2021-07-04 10:58:08 -07:00
silicons
1620aa46da Update carbon.dm 2021-07-04 10:55:02 -07:00
Putnam3145
21c77d25a2 yeah yeah sure whatever 2021-07-03 22:40:09 -07:00
Putnam3145
2be56ab992 Removes causes_dirt_buildup_on_floor 2021-07-03 22:19:05 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145
15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145
e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
Putnam3145
f1bcbc2573 Makes diagonal movement euclidean 2021-07-01 12:09:39 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
silicons
5e1cb8da38 more 2021-06-28 14:27:38 -07:00
silicons
805b931fb8 config reorganize start 2021-06-28 13:35:52 -07:00
silicons
7c87f6c7b7 sigh 2021-06-28 13:17:55 -07:00
silicons
0069f12c6f errors 2021-06-28 13:17:14 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
a73ca4be46 scope creep lmao 2021-06-28 12:29:18 -07:00