silicons
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
silicons
d5a19ea4b2
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
...
prefs for headpat wagging
2020-08-03 02:30:57 -07: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
zerothebigboy
34a8d8f798
a
2020-08-02 01:38:23 -04: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
timothyteakettle
caaedce6e2
end our suffering
2020-07-30 02:33:39 +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
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
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
silicons
33d5ba788b
aight
2020-07-24 20:19:18 -07:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
timothyteakettle
060b3dcd04
im sorry moths
2020-07-24 03:27:44 +01:00
silicons
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07:00
Timothy Teakettle
ed8723e74e
Merge branch 'master' into species-are-dumb
2020-07-23 22:15:10 +01:00
Timothy Teakettle
8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
Timothy Teakettle
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
silicons
d30acd5b09
smooth
2020-07-23 13:49:17 -07:00
Lin
e14f5ff576
Merge pull request #12832 from Citadel-Station-13/overlays-experimental
...
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
Lin
fbfd6286b5
Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
...
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
silicons
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
silicons
d520eaa0ad
Merge pull request #12854 from Zandario/tipes
...
tipes
2020-07-23 10:26:55 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
Keate Senior
fafde35ee2
Fixes the Arks looping issue, and gives Ratvar new words when fighting
...
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
silicons
703afec454
ok
2020-07-23 08:57:15 -07:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Zandario
bbf38c9898
tipes
2020-07-21 11:22:21 -05:00
silicons
5347b9f6a5
Update keybindings.dm
2020-07-20 21:33:03 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
944a91e44d
Update subsystems.dm
2020-07-20 15:55:41 -07:00
silicons
924309aab8
changeS
2020-07-20 11:11:12 -07:00
silicons
984796b8c6
sigh
2020-07-20 10:46:52 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
Timothy Teakettle
b06948bed4
fry smite
2020-07-20 17:48:37 +01:00
Keate Senior
beb6dd6e08
scripture changes and new marauder variant
...
The Ark summoning scripture is being temporarily moved to applications until I can fix it not showing up in a new UI tab, as well as adds the Clockwork Guardian, a marauder variant that acts similar to holoparasites/guardian spirits in the sense that they're linked to a host. slower than normal marauders but with more health, they can automatically block and counter any melee attack, and heal their host up to a small amount if the host is heavily injured (65% health)
2020-07-20 03:16:03 -04:00
silicons
6ac765eca5
Update subsystems.dm
2020-07-19 20:08:56 -07:00
silicons
512174b782
Update subsystems.dm
2020-07-19 20:07:16 -07:00
timothyteakettle
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
