LetterN
|
fab4b07be5
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-12-21 07:59:33 +08:00 |
|
DeltaFire
|
0faac6dce6
|
hoo boy
|
2021-12-14 23:06:42 +01:00 |
|
 BlueWildroseandGitHub
|
0e3d30e59f
|
Merge branch 'Citadel-Station-13:master' into wingport
|
2021-12-11 12:53:03 -07:00 |
|
 
|
da5140e1ca
|
Update code/modules/mob/living/carbon/human/species.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-12-08 05:21:52 -05:00 |
|
evan
|
0ca84b7cc5
|
Update species.dm
woops, forgot something
|
2021-12-07 22:11:56 -05:00 |
|
Cognition
|
014295655c
|
fixing a wrong reference, deco_wings/bat already exists
|
2021-12-07 19:45:43 -07:00 |
|
evan
|
afe6179191
|
Update species.dm
|
2021-12-07 21:39:17 -05:00 |
|
Cognition
|
318240bdc6
|
TG wing port - Now YOU TOO, can be an "angel"
|
2021-12-07 18:59:07 -07:00 |
|
DeltaFire
|
e576962ac3
|
e
|
2021-12-03 18:29:13 +01:00 |
|
 LinandGitHub
|
e506bc50dc
|
Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
|
2021-12-01 00:39:02 +00:00 |
|
 LinandGitHub
|
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 |
|
 siliconsandGitHub
|
38f7e07bcc
|
Update living.dm (#15394)
|
2021-11-23 18:36:51 +01:00 |
|
LetterN
|
41e5034005
|
i forgot about this component. Lavaland should have sounds now
|
2021-11-22 14:18:46 +08:00 |
|
Timothy Teakettle
|
d9276418ae
|
Update anthropomorph.dm
|
2021-11-22 00:15:42 +00:00 |
|
LetterN
|
8dcfea5817
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-11-21 10:34:14 +08:00 |
|
 LinandGitHub
|
22d297abe8
|
Merge pull request #15382 from keronshb/clockworkupdates
Allows Clockwork cultists to create Cogscarabs.
|
2021-11-20 07:03:32 +00:00 |
|
 LinandGitHub
|
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 |
|
LetterN
|
fa6946fae4
|
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
|
2021-11-16 16:10:12 +08: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 |
|
keronshb
|
659d7aa715
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-11-11 19:35:40 -05:00 |
|
Timothy Teakettle
|
8ef2ec4ac8
|
Update body_markings.dm
|
2021-11-05 15:38:25 +00:00 |
|
keronshb
|
9153115566
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-11-05 10:50:08 -04:00 |
|
DeltaFire
|
5d6978bb2f
|
oh god oh fuck
|
2021-11-04 21:06:42 +01:00 |
|
 LinandGitHub
|
74c6e05dd7
|
Merge pull request #15318 from silicons/evil
removes some evil defines from the code
|
2021-11-04 04:32:48 +00:00 |
|
 Putnam3145andGitHub
|
aba3720f22
|
Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
readds gps to bdm
|
2021-11-01 17:08:33 -07:00 |
|
 DrPainisandGitHub
|
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 |
|
 siliconsandGitHub
|
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 |
|
 siliconsandGitHub
|
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 |
|
keronshb
|
8978ee10fe
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-10-28 14:41:46 -04:00 |
|
 Letter NandGitHub
|
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 |
|
keronshb
|
6b23d177c8
|
Merge remote-tracking branch 'upstream/master'
|
2021-10-15 19:25:41 -04:00 |
|
keronshb
|
1427157df3
|
Fixes space cops and adds config for dynamic
|
2021-10-15 00:12:46 -04:00 |
|
keronshb
|
bf7cd77096
|
Fixes a few things
|
2021-10-13 23:25:01 -04:00 |
|
keronshb
|
6331ced3e5
|
The rest of the offering stuff
|
2021-10-13 22:13:33 -04:00 |
|
 WanderingFox95andGitHub
|
75fee6ec25
|
applies requested changes
|
2021-10-13 22:25:15 +02:00 |
|
 WanderingFox95andGitHub
|
afbc34eea2
|
Hmm
|
2021-10-13 22:18:07 +02:00 |
|
 WanderingFox95andGitHub
|
6763324506
|
Fixes the BDM's proc loop (Ported from TG)
|
2021-10-13 21:47:24 +02:00 |
|