shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,764 Commits 5 Branches 0 Tags
dff9dabf068fae39f2fcbe2c2d6809fb8811d3bf
Commit Graph
259 Commits
Author SHA1 Message Date
deathride58andGitHub 78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
astralloopandCitadelStationBot e8548b392b To go even further byond... the above lighting layer! (#36106) 
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
 2018-03-08 22:43:23 -06:00
PoojawaandGitHub 013c908ebf Update robot.dm 2018-03-06 23:39:06 -06:00
Poojawa 3c1e557302 compile issues 2018-03-06 22:35:16 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
CitadelStationBotandPoojawa 30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788) 
* Clean up all sorts of crap, mostly defines

* fixes compile errors
 2018-03-05 13:23:28 -06:00
PoojawaandGitHub 61b121a4c9 Dogborg fixes, Borg construction animations! (#5725) 
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
 2018-03-04 11:53:48 -06:00
deathride58andGitHub 21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
PoojawaandGitHub 743b1239bb Fixes dogborg offsets and gun layering (#5668) 
* Fixes dogborg offsets.

* Fixes Dogborg laser overlays

* comment fix.
 2018-02-22 23:48:24 -06:00
ShizCalevandCitadelStationBot d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Dax DupontandCitadelStationBot d368c42a98 Fixes extremely thicc robots (#35722) 
* Fixes extremely fat robots

* grasp
 2018-02-17 10:13:08 -06:00
LetterJayandGitHub 14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542 
[MIRROR] Cleans up some duplicate canusetopic warnings
 2018-02-15 22:17:54 -06:00
orangesandCitadelStationBot 5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
deathride58andGitHub e873fce53f Update laws.dm 2018-02-15 20:28:05 -05:00
AnturKandCitadelStationBot 10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalevandCitadelStationBot f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58andGitHub a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
Jordan BrownandCitadelStationBot fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
vuonojenmustaturskaandCitadelStationBot 56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
orangesandCitadelStationBot d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs 
Fixes cyborg related cuffing issues
 2018-02-08 03:07:51 -06:00
SlignerdandCitadelStationBot afcdb771b3 Squashes silicon HUDs together (#35212) 
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
 2018-02-07 02:32:14 -06:00
CitadelStationBotandPoojawa 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBotandPoojawa b25bcbbfab [MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. (#5315) 
* Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)

* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code

* Fixes power cell name and makes borgs use a standard high capacity cell.
 2018-02-05 00:47:39 -06:00
Poojawa a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
LeoandCitadelStationBot 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
AnturKandCitadelStationBot 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
ShizCalevandCitadelStationBot 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
PKPenguin321andCitadelStationBot 145cc8a822 Makes cyborg module damage visible to anyone nearby (#34287) 
* swaps to_chats with visilbe_messages in damage feedback

* adds an actual alarm sound
 2018-01-11 21:32:24 -06:00
LeoandCitadelStationBot 5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
deathride58andGitHub 6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
orangesandCitadelStationBot 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
deathride58 66f0a9c2b7 mob living silicon 2018-01-04 01:06:25 -05:00
orangesandCitadelStationBot 3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
LetterJayandGitHub a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJayandGitHub f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
deathride58andGitHub b03a8a70db Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442 
[MIRROR] [READY]Adds picking up corgis and pAIs!
 2017-12-29 06:47:17 +00:00
YPOQandCitadelStationBot 6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
deathride58 3df98e631b Fixes compiling errors 2017-12-28 16:13:30 -05:00
deathride58 2fdb9e598f Modularizes dogborgs, adds new alternate skins for some modules, and more! 2017-12-28 15:50:33 -05:00
kevinz000andCitadelStationBot bf7838aded [READY]Adds picking up corgis and pAIs! 2017-12-27 15:47:57 -06:00
YPOQandCitadelStationBot 752e3f7378 Fixes AI camera lights not updating when tracking mobs (#33849) 2017-12-26 18:30:24 -06:00
LetterJayandGitHub 5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
Jordan BrownandCitadelStationBot af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -06:00
kevinz000andCitadelStationBot bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
MatthewandGitHub 529e839203 dog borgs module icon fix 2017-12-21 13:46:44 -06:00
LetterJayandGitHub 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00