Commit Graph

5789 Commits

Author SHA1 Message Date
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Lin
460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Fix for floorbots not placing a plate before placing a floor.
2021-02-17 17:28:03 -06:00
shellspeed1
303d35074d Another fix for infinite floor tiles 2021-02-16 20:24:50 -08:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Lin
975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo
age gate 2 electric boogaloo
2021-02-15 18:16:44 -06:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
2021-02-14 22:52:44 -06:00
shellspeed1
3222703917 makes floor bots place a plate before a tile 2021-02-14 16:42:59 -08:00
Lin
62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27
makes people on the ground punch less hard. completely removes punch rng miss.
2021-02-13 23:30:00 -06:00
silicons
43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
timothyteakettle
b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
2021-02-13 19:06:39 -07:00
silicons
731c368ba7 Merge pull request #14231 from DeltaFire15/sigh
sigh
2021-02-12 19:00:14 -07:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
2021-02-12 05:06:48 +01:00
DeltaFire
06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
DeltaFire
5afa573fa6 sigh
sigh
2021-02-12 00:50:42 +01:00
Timothy Teakettle
e433c0b172 Update living.dm 2021-02-08 17:04:55 +00:00
Timothy Teakettle
3d97c1fb89 log fix 2021-02-08 17:00:26 +00:00
Timothy Teakettle
b7e9169257 Update human.dm 2021-02-08 16:44:02 +00:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
raspy-on-osu
a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu
3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
silicons
055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
TyrianTyrell
f009249f7e Update say.dm 2021-02-01 09:38:38 -05:00
TyrianTyrell
3e9f14526d Typofix 2021-02-01 09:35:24 -05:00
TyrianTyrell
643c4cf368 Update say.dm 2021-02-01 09:31:57 -05:00
TyrianTyrell
46e64d4dd3 Update say.dm 2021-02-01 09:15:43 -05:00
TyrianTyrell
ff8c8f12d9 Moving a thing 2021-02-01 09:14:44 -05:00
TyrianTyrell
66cc55af3e Update say.dm 2021-02-01 09:08:23 -05:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
2021-01-31 23:33:59 -06:00
timothyteakettle
276dfee0d8 Update dwarves.dm 2021-02-01 01:29:37 +00:00
TyrianTyrell
9acdad29c5 Update say.dm 2021-01-31 14:33:33 -05:00
Hatterhat
4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons
c554f0567e Update human.dm 2021-01-29 11:57:28 -07:00
raspy-on-osu
8077d72edd more efficient 2021-01-28 18:47:02 -05:00
raspy-on-osu
fe499636c3 init 2021-01-28 18:42:45 -05:00
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
silicons
fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
silicons
1c99225fbd Update human.dm 2021-01-27 20:48:07 -07:00
silicons
a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
2021-01-27 19:08:25 -07:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
2021-01-27 17:16:44 -06:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
zerothebigboy
ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
silicons
36215c5d48 Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
2021-01-25 23:01:23 -07:00