shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,550 Commits 5 Branches 0 Tags
033feebcd0aa8fb7c216fa6341cb145c6bb1fd20
Commit Graph

16345 Commits

Author SHA1 Message Date
silicons
033feebcd0 Merge pull request #12957 from kappa-sama/patch-34 
removes malf disk from tendril loot
 2020-08-29 21:31:24 -07:00
silicons
50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull 
Tesla Counterplay.
 2020-08-29 21:24:41 -07:00
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
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
ForrestWick
84ed82c9e7 whyseris 2020-08-28 22:09:30 -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
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
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
raspy-on-osu
172fe663c3 remove redundant separate tesla log and merge it into the singulo log 
also formatting because i hate inconsistent whitespace
 2020-08-27 02:46:19 -04:00
raspy-on-osu
350a99a4ba teslas now fizzle at 0 energy and adds admin log for fizzles 
fixing the tesla engine 100% speedrun world record
 2020-08-27 02:39:09 -04:00
raspy-on-osu
68cb78ba51 why is this here 
no really how the fuck did this happen
 2020-08-27 00:03:58 -04:00
raspy-on-osu
7840205d4e shuffle containment checking for optimization 
now it should be checking less (tested, functionally identical to before)
 2020-08-26 23:59:15 -04:00
raspy-on-osu
f3990732f3 remove excess whitespace 
title
 2020-08-26 21:25:45 -04:00
raspy-on-osu
6fc019ebf8 create unique containment check for the tesla 
it now functions as normal. it only checks for containment in a 10 tile radius (this should work fine for the default setups of Delta and Lambda).
 2020-08-26 21:20:23 -04:00
timothyteakettle
8d6a026153 yep 2020-08-27 00:01:54 +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
raspy-on-osu
46bec76f41 tesla can now be contained 
for whatever reason, the contained variable was unused for teslas, but now it is
unintentional side-effect may be that grounding rods for tesla containments with a larger than 1x1 tile space might get eaten (untested but assumed)
 2020-08-25 00:46:04 -04:00
raspy-on-osu
1a5248359c if(rods) literally just eats disk space and nothing more 
no longer. 300 bytes saved
 2020-08-24 23:46:38 -04:00
raspy-on-osu
2e5517b9f3 if committing above suggestion, remove these two lines 
ok done
 2020-08-24 23:36:37 -04:00
raspy-on-osu
1fdb233ede Update code/modules/power/tesla/energy_ball.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-08-24 23:35:17 -04:00