shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,377 Commits 5 Branches 0 Tags
68cb78ba51119db28f2aefcdbc74359d98d57cdf
Commit Graph

24573 Commits

Author SHA1 Message Date
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
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
raspy-on-osu
77015ed166 Update code/modules/power/tesla/energy_ball.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-08-24 23:33:27 -04:00
raspy-on-osu
df30569104 Update code/modules/power/tesla/energy_ball.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-08-24 23:32:48 -04:00
raspy-on-osu
591fc16747 oops! no grounding rods 
now it (hopefully) won't delete rods from within containment
 2020-08-24 23:20:28 -04:00
raspy-on-osu
9743e5b458 tesla counterplay?? 
just put out some grounding rods and it'll eat up the rods at expense of some energy
 2020-08-24 23:10:44 -04:00
raspy-on-osu
2439a0654b it likes moving grounding rod 
now it actually gets the dir instead of just adding the rod itself to the pick

also moved declaration of move_dir because dm was freaking out because i had two declarations
 2020-08-24 20:54:36 -04:00
raspy-on-osu
580afaf74a init 
first attempt
 2020-08-24 20:29:25 -04:00
silicons
40b489006d Merge pull request #13225 from raspy-on-osu/teg-castration 
Heavily nerfs the TEG.
 2020-08-23 17:52:44 -07:00
silicons
64968bd655 Merge pull request #13242 from Literallynotpickles/coat-sensors 
lets you equip handheld crew monitors on all med winter coats
 2020-08-23 17:41:10 -07:00
silicons
f0bcab1143 Merge pull request #13241 from Putnam3145/voreeject 
Made all death release vore contents, not just gibbing/dusting
 2020-08-23 17:39:43 -07:00
silicons
f86daefa4e Merge pull request #13240 from timothyteakettle/ipcs-spark-when-blush 
ipcs make fake electrical sparks when they blush or cry
 2020-08-23 17:36:23 -07:00
silicons
82d8b7266f Merge pull request #13238 from Hatterhat/insidious-tackle 
insidious combat gloves but they can tackle now
 2020-08-23 17:36:03 -07:00
silicons
4d7d068407 Update airlock.dm (#13182) 2020-08-23 21:01:26 +02:00
silicons
a8ee36fe85 fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209) 
* Update wormhole_jaunter.dm

* Update wormhole_jaunter.dm
 2020-08-23 21:00:07 +02:00
silicons
1abe2458ee Update taeclowndo.dm (#13227) 2020-08-23 20:58:34 +02:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items 
adds three t1 donator items
 2020-08-23 05:08:50 -07:00
silicons
7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike 
zero adds black fetish gloves because hes Horny
 2020-08-23 05:08:14 -07:00
Putnam3145
ecbf8a5dc2 Merge pull request #13245 from Arturlang/fortitude_norun 
Fortitude walking fix
 2020-08-23 04:33:51 -07:00
Artur
b47b14cdaa Shoot me please 2020-08-23 14:26:07 +03:00
Suicidalpickles
811a6708df h 2020-08-22 18:01:18 -07:00
Putnam
87080bfac4 Made all death release vore contents, not just gibbing/dusting 2020-08-22 17:51:32 -07:00
timothyteakettle
b68baf2f25 this is funny 2020-08-23 01:44:33 +01:00
silicons
188bb13272 Merge pull request #13181 from Putnam3145/dynnamic 
Dynamic: tweaks and fixes: the reckoning
 2020-08-22 15:22:19 -07:00
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath 
breath mask balaclava
 2020-08-22 15:22:04 -07:00
silicons
876dc36dbc Merge pull request #13201 from kiwedespars/return-the-punch 
makes it so you can craft armwraps roundstart again.
 2020-08-22 15:21:22 -07:00
silicons
68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes 
lizards are shitcode
 2020-08-22 15:19:48 -07:00
silicons
a4aeb38433 Merge pull request #13221 from Ludox235/fuck-lowpop-xenos 
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
 2020-08-22 15:19:21 -07:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
silicons
5c09004dc1 Merge pull request #13228 from DeltaFire15/apc-ui-access-fixes 
Fixes silicons and ratvarians accessing APCs
 2020-08-22 15:19:00 -07:00
zerothebigboy
21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Hatterhat
8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Timothy Teakettle
60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
kiwedespars
055d397e1e adds tape 2020-08-21 13:34:02 -07:00
DeltaFire
bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02:00
zerothebigboy
5d611155f1 a 2020-08-21 02:15:30 -04:00
zerothebigboy
5741db4a13 Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas 
# Conflicts:
#	code/game/objects/items/weaponry.dm
 2020-08-21 02:13:44 -04:00
zerothebigboy
a9abdeb044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas 2020-08-21 02:10:03 -04:00
zerothebigboy
421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy
cca7e66457 a slight blink flavor 2020-08-21 01:54:09 -04:00
zeroisthebiggay
a183fb3165 Update weaponry.dm 
thats an extra space
 2020-08-21 01:45:23 -04:00
zeroisthebiggay
7f036428bd Update weaponry.dm 
thats an extra space
 2020-08-21 01:40:19 -04:00
zerothebigboy
b960f4055d a 2020-08-21 01:31:30 -04:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00