shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

92 Commits

Author SHA1 Message Date
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01: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
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
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Hatterhat
590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
kevinz000
a3917a81b0 Update energy_ball.dm 2019-08-30 15:18:22 -07:00
kevinz000
bc74ce110a Update energy_ball.dm 2019-08-30 15:17:23 -07:00
Ghommie
b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
kevinz000
f140d56b43 Update coil.dm 2018-12-31 23:41:01 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
cee8da4fdb Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11 
readds tesla coil deathtraps
 2018-07-06 01:37:42 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
kevinz000
97531c61ff Update coil.dm 2018-06-18 12:04:19 -07:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
kevinz000
d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
kevinz000
33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58
02c3f6d0a0 Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399 
[MIRROR] Fixes the tesla coil research screwdrivering
 2018-03-18 00:18:55 +00:00
deathride58
b9a73ded87 Update coil.dm 2018-03-17 19:48:42 -04:00
RandomMarine
c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437) 
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
 2018-03-17 08:49:38 -05:00
vuonojenmustaturska
a4e10653c7 Fixes the tesla coil research screwdrivering 2018-03-17 08:30:54 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
Poojawa
9785222155 tweaks Tesla Point income (#5849) 
* reigns in excessive point creep

* actually do math on this shit.
 2018-03-10 07:12:24 -06:00
Poojawa
0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787) 
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
 2018-03-06 03:59:11 -06:00