Commit Graph

6317 Commits

Author SHA1 Message Date
evan
0ca84b7cc5 Update species.dm
woops, forgot something
2021-12-07 22:11:56 -05:00
evan
afe6179191 Update species.dm 2021-12-07 21:39:17 -05:00
DeltaFire
e576962ac3 e 2021-12-03 18:29:13 +01:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Lin
f33af9b35c Merge pull request #15392 from timothyteakettle/fix-oil-drum
oil drum now recognises synthetic anthormorphs as synths
2021-11-23 21:55:07 +00:00
silicons
38f7e07bcc Update living.dm (#15394) 2021-11-23 18:36:51 +01:00
Timothy Teakettle
d9276418ae Update anthropomorph.dm 2021-11-22 00:15:42 +00:00
Lin
22d297abe8 Merge pull request #15382 from keronshb/clockworkupdates
Allows Clockwork cultists to create Cogscarabs.
2021-11-20 07:03:32 +00:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation
Devastation level explosions no longer delete organs of gibbed humans
2021-11-17 16:19:23 +00:00
keronshb
7b195c3973 Cogscarabs
The return
2021-11-16 22:41:08 -05:00
Putnam3145
2cdc3a9d30 makes regal rat require not being dead to use abilities 2021-11-15 21:02:52 -08:00
DeltaFire
6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1 this WILL fail CI
hnnnngh
2021-11-14 20:48:41 +01:00
DeltaFire
b4e6b0785d chemscan
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
2021-11-12 19:38:10 +01:00
Timothy Teakettle
8ef2ec4ac8 Update body_markings.dm 2021-11-05 15:38:25 +00:00
DeltaFire
5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
Lin
74c6e05dd7 Merge pull request #15318 from silicons/evil
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
Putnam3145
aba3720f22 Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
readds gps to bdm
2021-11-01 17:08:33 -07:00
DrPainis
5cb1388f11 Makes moving NOT give you nutrition anymore. (#15316)
* makes moving not make you fat anymore

* same as the previous commit, but even less coding
2021-10-30 18:00:13 +02:00
silicons
eb7fd90d3f Update blood_drunk_miner.dm 2021-10-30 03:31:57 -07:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
silicons
319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
DeltaFire
451025af28 fix 2021-10-29 01:42:28 +02:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
SandPoot
67c6cc3fc0 tiny fix 2021-10-27 13:48:34 -03:00
Higgin
5c16f13394 Makes bodies laying on the ground also act as obstacles to crawling.
Adds proper comments.
2021-10-21 05:52:33 -07:00
SandPoot
8adf4606d7 closes #15279 2021-10-17 23:04:24 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
WanderingFox95
75fee6ec25 applies requested changes 2021-10-13 22:25:15 +02:00
WanderingFox95
afbc34eea2 Hmm 2021-10-13 22:18:07 +02:00
WanderingFox95
6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
Putnam3145
b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking
fixes afk detection
2021-10-11 15:52:03 -07:00
Putnam3145
83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44
[experimental] changes to slowdown scaling
2021-10-11 15:51:33 -07:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
keronshb
5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243)
* Removes hardstun

* oops adds the disarm
2021-10-06 17:30:13 +02:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
Tupinambis
383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) 2021-10-06 17:19:59 +02:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
silicons
f317e510f7 Merge pull request #15191 from keronshb/ninjaadjustment
Puts the ninja status back into the status window and restores the energy charge meter.
2021-09-28 00:14:42 -07:00
silicons
cefef5b0bc Merge pull request #15203 from zeroisthebiggay/buggers
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
2021-09-27 23:31:03 -07:00