Commit Graph

24645 Commits

Author SHA1 Message Date
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00
silicons
8cc84152d8 Merge pull request #13267 from Arturlang/op_slimes
Lets slime damage structures
2020-08-29 21:22:27 -07:00
silicons
84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
silicons
78b8072d13 Merge pull request #13272 from Detective-Google/patch-1
plasmamen are playable now
2020-08-29 21:21:23 -07:00
silicons
7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
silicons
e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
silicons
e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2
Further tweaks the TEG's power output
2020-08-29 21:19:18 -07:00
silicons
5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
silicons
ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip
Nukies can't get wall-boots anymore
2020-08-29 21:17:26 -07:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N
116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
ForrestWick
84ed82c9e7 whyseris 2020-08-28 22:09:30 -04:00
raspy-on-osu
4f2f6b537e credit's already given in the pr let's not 2020-08-28 13:44:41 -04:00
raspy-on-osu
96d006f551 oops 2020-08-27 23:48:19 -04:00
raspy-on-osu
ca34a50726 Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295 2020-08-27 23:39:43 -04:00
Putnam
c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
raspy-on-osu
d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
Timothy Teakettle
b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle
398692df0b emotes 2020-08-27 20:24:37 +01:00
Lynxless
4caeb310f7 Added blank line to the end of files 2020-08-27 15:59:07 -03:00
Lynxless
828a65a7fd New branch test 2020-08-27 15:46:40 -03:00
silicons
664b2490c3 Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
2020-08-27 10:07:31 -07:00
silicons
b162d8184d Merge pull request #13237 from Hatterhat/pda-bomb-limited
pda bomb buyonce
2020-08-27 10:07:05 -07:00
silicons
2bc92145df Merge pull request #13256 from EmeraldSundisk/coglox
Expands CogStation's airlocks, among other things.
2020-08-27 10:03:33 -07:00
silicons
734ed238b7 Merge pull request #13257 from timothyteakettle/so-ya-like-qol-huh
qol: customization features appear in alphabetical order
2020-08-27 10:03:15 -07:00
silicons
9440a92c09 Merge pull request #13258 from shellspeed1/iv-drips
Ports drip feeding mode for iv drips from tg.
2020-08-27 10:02:43 -07:00
silicons
857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
silicons
ec9b82381b Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
2020-08-27 09:42:08 -07:00
Detective-Google
9f7a358bb9 plasmamen are playable now 2020-08-27 11:37:13 -05:00
timothyteakettle
8d6a026153 yep 2020-08-27 00:01:54 +01:00
Artur
6c8b256e48 dont griff please 2020-08-26 20:23:19 +03:00
Artur
aaa8046dd2 Lets slime damage structures 2020-08-26 19:32:17 +03:00
timothyteakettle
97564312e3 mindreaders know your move 2020-08-26 17:06:58 +01:00
silicons
c264d90140 Update eyes.dm (#13254) 2020-08-26 18:00:27 +02:00
silicons
ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
silicons
1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
Timothy Teakettle
d877a8c0fb qol (#13250) 2020-08-26 14:14:19 +02:00
Ghommie
2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02:00
silicons
f611fee193 mecha are no longer immune to goliath tentacles (#13172)
* Update goliath.dm

* Update goliath.dm

* Update goliath.dm
2020-08-26 13:06:53 +02:00
Letter N
57a008d567 fixes adminbus 2020-08-26 11:22:57 +08:00
timothyteakettle
5cf06be877 cancel on move 2020-08-26 01:09:51 +01:00
timothyteakettle
f908475617 rock paper scissors 2020-08-26 01:01:09 +01:00
silicons
9d0fafd09e Update ventcrawling.dm (#13061) 2020-08-25 23:08:34 +02:00
silicons
1608214156 gives vortex blasts 50% armor pen vs mechas (#13171)
* Update hierophant.dm

* Update hierophant.dm

* Update hierophant.dm
2020-08-25 22:17:36 +02:00
silicons
973839dee4 ports my baystruments updates from tg (#13219)
* subsystem

* fix

* e

* update

* fix
2020-08-25 21:04:42 +02:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
silicons
9ac429fb8d Merge pull request #13132 from ancientpower/newscaster-fix
Ghosts can read newscasters by clicking on them
2020-08-25 09:06:46 -07:00
shellspeed1
de7ecefad2 minor description change 2020-08-24 15:07:40 -07:00
shellspeed1
142dee3645 Update iv_drip.dm 2020-08-24 12:47:56 -07:00