lolman360
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
silicons
d25daec117
Merge pull request #13081 from Putnam3145/ethereals
...
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
silicons
3acd4ac6de
Merge pull request #13069 from Chiirno/radioactive-port
...
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
Letter N
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
Lin
dea2dab536
Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
...
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
Putnam
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Lynxless
14e35806b9
I hope this works
2020-08-07 16:23:15 -03:00
silicons
65839060c9
Fixes
2020-08-06 23:39:57 -07:00
silicons
3640a33ff6
e
2020-08-06 23:22:53 -07:00
silicons
8edb374a20
sigh
2020-08-06 23:09:02 -07:00
silicons
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
silicons
58a19ffe4b
Update signals.dm
2020-08-06 21:38:11 -07:00
silicons
009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
Lin
bc2e97a2a4
Merge pull request #13006 from Citadel-Station-13/silicons-patch-68
...
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
2020-08-05 19:42:28 -05:00
DeltaFire
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
Letter N
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
silicons
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
Letter N
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
DeltaFire
932eeeecef
rites actually work now
...
Rites can be casted now, added a show info option on the sigil of rites, adds a TON of debug messages, if this is PRd while they are still in yell at me loudly. Also adds the rite of advancement, a rite used to implant organs into a servant, without surgery being required.
2020-08-03 14:43:50 +02:00
silicons
d5a19ea4b2
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
...
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
DeltaFire
abf825280b
Modifies a bunch and adds rite support
...
Clockie implants don't get detected by medscanners, brass claws get combo aka bonus damage on consecutive attacks against the same target, spears have a check for now accidentally draining vitality, and rite support has been added via a special sigil, though as of now there only is the 'base' rite which should never actually exist / be casted
2020-08-02 21:43:41 +02:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
silicons
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
silicons
f0a02c2c99
Update _storage.dm
2020-08-01 23:35:42 -07:00
zerothebigboy
34a8d8f798
a
2020-08-02 01:38:23 -04:00
Timothy Teakettle
7c8f03a81f
new defines
2020-08-01 18:29:27 +01:00
silicons
2230a3665a
Merge pull request #12965 from timothyteakettle/end-our-suffering
...
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
timothyteakettle
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
Timothy Teakettle
31963b32a4
subcategories cool
2020-07-29 17:14:07 +01:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
timothyteakettle
c15d0de20d
subcategories work
2020-07-29 03:57:16 +01:00
Lin
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
Lin
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Timothy Teakettle
721e018aec
loadout stuff
2020-07-28 22:52:00 +01:00
silicons
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
silicons
20d9c74f9f
Merge pull request #12876 from timothyteakettle/species-are-dumb
...
tidies up species files
2020-07-26 22:52:00 -07:00
timothyteakettle
28bf5d2344
remove c
2020-07-26 23:15:56 +01:00
silicons
49070d732b
ohhhhhhh boy
2020-07-26 15:10:08 -07:00
Timothy Teakettle
36d6246bc1
it is now harder to deal wounds
2020-07-26 18:54:57 +01:00
silicons
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
timothyteakettle
3467bf3515
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-07-26 00:25:26 +01:00
Timothy Teakettle
8b2a92994f
less rng reliance
2020-07-25 20:14:41 +01:00
Timothy Teakettle
238af723bb
makes insects specifically insects not flies
2020-07-25 18:14:12 +01:00
DeltaFire
db823ac16c
fixes the organ bitfields
2020-07-25 19:13:08 +02:00
