0001a2edca
Merge pull request #13669 from Arturlang/sacrifice_tweaks
...
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
10c90e06c1
Merge pull request #13661 from timothyteakettle/age-verification
...
adds in-game age verification as an alternative to access requests
2020-11-08 11:07:05 -06:00
7bce2115db
Merge pull request #13642 from Citadel-Station-13/tgs-dmapi-update
...
Automatic TGS DMAPI Update
2020-11-07 00:33:36 -07:00
ab33acf962
Merge pull request #13602 from Putnam3145/better_dynamic
...
Adds a new "minor antag" roundstart to dynamic
2020-11-07 00:18:51 -07:00
ce8dba6062
Update TGS DMAPI
2020-11-07 00:37:22 +00:00
e2ca7164b9
age verification
2020-11-06 21:00:14 +00:00
d500a12b70
adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. ( #13584 )
...
* Update say.dm
* Update mob.dm
* Update emotes.dm
* Update say_vr.dm
* Update emote.dm
* Update emotes.dm
* Update mob.dm
* Update say_vr.dm
* Update drake.dm
2020-11-01 22:09:38 +01:00
4017618744
removes batform from roundstart halloween vampire ( #13623 )
...
* Update species.dm
* Update vampire.dm
* Update vampire.dm
2020-11-01 22:05:49 +01:00
46dbb9345d
slime puddles look better and cant be abused by lings ( #13567 )
...
* perfect
* further changes
* no squeaking please
* no more squeaking damnit
* no more squeaking damnit
* slower
* they get broken armor
* broken armor application
* Apply suggestions from code review
* add a comma
* make crossed work properly
* Update squeak.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-11-01 21:40:58 +01:00
1738233c27
Adds a new "minor antag" roundtype to dynamic
...
with an associated storyteller, even
2020-10-19 20:20:51 -07:00
558d11bc73
Stringified the vote #defines for easier config stuff
2020-10-18 14:49:43 -07:00
fcd8fec815
Fixes an oversight and updates some defines ( #13558 )
2020-10-17 12:37:58 +02:00
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
bf7d68884b
Merge pull request #13510 from silicons/google
...
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
737b6460af
Merge pull request #13497 from Zandario/species-refactor
...
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
8b48cab574
Merge pull request #13233 from Hatterhat/za-hando
...
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
3557f00316
Merge pull request #13498 from deathride58/lingbloodupgrade
...
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
20f1e0818e
Merge pull request #13479 from LetterN/another-update-mayhaps
...
Fixes minimap, and dmdocs other things
2020-10-03 18:02:29 -07:00
b48f4b91e6
Merge branch 'master' into eye-sprites
2020-10-04 01:23:03 +01:00
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
21d3d8fcd9
sigh
2020-10-03 14:17:13 -07:00
195dd5356b
sig missing
2020-10-03 11:47:43 +08:00
27745d316e
lmao so apparently that breaks byond's compiler
2020-10-02 19:41:18 -04:00
cbe6178a11
reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum
2020-10-02 19:21:30 -04:00
1620e3887c
Merge branch 'master' into species-refactor
2020-10-02 17:19:48 -05:00
bdd121cd81
Prep Work
2020-10-02 17:17:50 -05:00
950cb05617
Merge remote-tracking branch 'upstream/master' into slime-puddle
2020-10-02 15:53:48 +01:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
121ec996cf
fuck it no resting
2020-10-01 23:09:20 +01:00
57733473fe
TRAIT SOURCE DEFINE
2020-10-01 21:23:17 +01:00
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
1f82e8985c
Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
...
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
fba8bfbf4f
Merge pull request #13467 from Putnam3145/past-me-idiot
...
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
7553508a2a
Merge pull request #13455 from Putnam3145/pyroclastic-policy
...
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
silicons