Commit Graph

3591 Commits

Author SHA1 Message Date
silicons
8ff0685f0d Update world_topic.dm 2021-05-15 18:28:00 -07:00
silicons
55ee9a00b4 woo yeah woo yeah 2021-05-12 18:24:26 -07:00
silicons
8e2921f3c0 woo 2021-05-12 17:36:01 -07:00
silicons
59f160be57 woo 2021-05-12 16:59:48 -07:00
silicons
2a3a45573f woo 2021-05-12 16:58:17 -07:00
silicons
6237928c4b woo 2021-05-12 16:55:21 -07:00
silicons
0b9d021d9b woo 2021-05-12 16:51:28 -07:00
silicons
482be2ee0d okay 2021-05-12 16:37:13 -07:00
silicons
3fb84eb1d8 fix 2021-05-12 03:35:02 -07:00
silicons
aeefeb6c53 woo 2021-05-12 03:33:41 -07:00
silicons
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
silicons
cb1e2f3730 thing 2021-05-06 02:09:06 -07:00
silicons
b108a6fe7e Merge pull request #14643 from necromanceranne/space_adapt_resprite
Changes the space adaptation sprite to something more subtle.
2021-04-28 21:16:51 -06:00
silicons
7c1358a39d Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
2021-04-25 17:10:09 -06:00
silicons
d07f1f3d30 Update radioactive.dm (#14615) 2021-04-24 21:51:53 +02:00
necromanceranne
c819879473 Changes the space adaptation sprite to something more subtle. 2021-04-23 12:06:24 +10:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
The0bserver
59d69125f6 Consistency: You can hide it in your boots! 2021-04-21 12:18:01 -04:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
silicons
e8e625cb5c Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00
rossark
2b2dc88d6f viro symptom typo fix (#14600)
fixes a  typo stating wrong treshold
2021-04-12 18:39:24 +02:00
Blue Wildrose
610dd41cb9 Fixes phantom mob-holder items 2021-04-08 21:12:30 -07:00
silicons
f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
silicons
a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
Blue Wildrose
e29beaf852 I'll use this linter error as an opportunity to fix some grammar 2021-04-03 11:26:35 -07:00
Blue Wildrose
d55bb8231d Buffs autotomy 2021-04-03 10:55:34 -07:00
Blue Wildrose
b363cdd5ca fixes puddles, cultism checks, spellchecks 2021-04-01 04:29:35 -07:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
silicons
bdbb33842e Merge pull request #14513 from Putnam3145/chaos-for-secret
Makes threat a subsystem instead of dynamic-attached
2021-03-27 01:33:27 -06:00
silicons
8a5d87725b Merge pull request #14515 from CuteMoff/Plasmaispogtake2
Lets try again, Plasma Ingots (Fucked up the first time)
2021-03-27 01:32:47 -06:00
silicons
bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
necromanceranne
8091844a1c Urist McGreyshit regains their grip on the ! 2021-03-27 14:06:41 +11:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
7265724c5b Update basemats.dm 2021-03-25 10:29:56 -04:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
necromanceranne
45340ef1ac Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed. 2021-03-25 09:27:33 +11:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
CuteMoff
ee4fad7966 Update basemats.dm 2021-03-23 20:34:17 -04:00
DeltaFire
afd8af60e3 Merge pull request #14430 from YakumoChen/genetics
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
2021-03-23 22:35:54 +01:00
silicons
bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes
Black Market: The return
2021-03-22 21:14:57 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
kappa-sama
1f7b15d8f8 clonwops 2021-03-19 15:35:17 -03:00
LetterN
2c2e779aa6 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-19 10:28:43 +08:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
DeltaFire
b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00