28 Commits

Author	SHA1	Message	Date
BongaTheProto	57a7a516e6	Merge remote-tracking branch 'upstream/master'	2023-03-06 22:43:10 -05:00
zerothebigboy	091d9ec00f	good	2023-01-30 00:01:22 -05:00
BongaTheProto	783ae63c30	Merge remote-tracking branch 'upstream/master'	2022-05-02 19:47:29 -05:00
Timothy Teakettle	e689d16589	i swear im testing it right now and this is not a web edit	2022-04-27 15:26:17 +01:00
Timothy Teakettle	ac4a41243a	add salt quirk	2022-04-27 14:58:54 +01:00
BongaTheProto	48e6112c7b	Merge remote-tracking branch 'upstream/master'	2022-02-04 13:44:04 -05:00
DeltaFire	e71e86cf23	adapted	2022-01-29 16:43:03 +01:00
BongaTheProto	ed8b355b98	Merge remote-tracking branch 'upstream/master'	2022-01-23 16:09:22 -05:00
DeltaFire	0faac6dce6	hoo boy	2021-12-14 23:06:42 +01:00
E	cf757b84af	more ashie shit	2021-11-18 23:18:24 +01:00
keronshb	d2f69acaf8	Space Dragon Event ... Ports the Space Dragon event	2021-05-18 12:06:32 -04:00
necromanceranne	6ebc911937	Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge.	2021-03-16 04:48:55 +11:00
silicons	fd497b3297	Update traits.dm	2021-02-24 01:23:06 -07:00
silicons	94cc70f7b9	Update traits.dm	2021-02-24 01:21:00 -07:00
Artur	2f619ffc4e	Traits	2021-01-13 10:27:10 +02:00
DeltaFire	282a5d6ab2	aaactually lets just make robots immune in general	2020-11-24 20:32:42 +01:00
DeltaFire	a3208d1ac8	synth alcohol immunity	2020-11-24 20:27:34 +01:00
DeltaFire	410ffffcc3	there we go ... robot rad safe: 250, 750 with upgrade (500 for normal mobs) Also some typo fixes	2020-11-15 20:30:50 +01:00
DeltaFire	5af48a22dd	adds a surgery to fix corruption	2020-11-13 02:24:52 +01:00
DeltaFire	76fe1a77bc	Merge remote-tracking branch 'upstream/master' into system-corruption	2020-11-13 01:00:50 +01:00
Artur	503d0156c6	Does the thing	2020-11-08 23:24:58 +02:00
DeltaFire	ed08983b97	syscorruption framework ... Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.	2020-11-01 04:56:31 +01:00
kiwedespars	eb8574d6d6	heretics from tg (with changes)	2020-08-10 19:17:26 -07:00
Timothy Teakettle	eba1e8f301	fixes the merge conflicts	2020-06-15 23:29:49 +01:00
Timothy Teakettle	38bf529f3c	a tonne of fixes	2020-06-11 20:18:36 +01:00
Timothy Teakettle	4c55e86da7	part 2	2020-06-10 23:14:25 +01:00
Ghom	12ac08d7c5	Porting tesla/electrocute code updates. (#12280) ... * Porting tesla/electrocute code updates. * Why is the dominator being insta-deleted by zaps a good idea? * Yikes. * ah	2020-05-17 16:35:17 -07:00
Ghommie	e17c51a85d	Porting some VV updates from tg.	2020-04-25 00:49:51 +02:00