shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,067 Commits 5 Branches 0 Tags
773a94dea69b51777991afeb5d7cfd79cf6daa41
Commit Graph
105 Commits
Author SHA1 Message Date
deathride58 621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
deathride58andkevinz000 40dd962a16 Adds a non-vore variant for the medihound sleeper, replaces "Allow medihound sleeper" pref with "Voracious medihound sleepers" pref (#7659) 
* The medihound sleeper pref no longer disables use of the medihound sleeper, but rather determines the voracious hound sleeper sprite/flavortext

* Axes stray north/south belly sprites in the nonvore variants
 2018-11-02 12:53:11 -07:00
Poojawa ca822954e4 Fixes Dogborg animations & huds 
Also makes the silent check more sensible for prey loop. Re-adds borg repair balancing.
 2018-09-16 16:09:53 -05:00
Poojawa 1a2460ed28 Continous update intergration until being merged 
Also tgui fixes/updates
 2018-09-15 00:37:29 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58andGitHub 924fcc29fb Merge branch 'master' into kevinz000-patch-13 2018-07-06 01:39:25 -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
LetterJayandGitHub 16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646 
[MIRROR] [Ready]Expands the list of borg-wearable hats
 2018-07-01 09:32:08 -05:00
LetterJayandGitHub 605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
zxaberandletterjay 673ad79a32 [Ready]Expands the list of borg-wearable hats (#38646) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Update robot.dm

* Update robot.dm

* Update robot.dm

* Update robot_defense.dm

* Update _masks.dm

* Update robot_parts.dm

* Update robot_defense.dm

* replaced type with istype

* Reverting masks.dm

* Removing special snowflake bandana check.

* Update robot_defense.dm

* Added Captain's Crown

By player request.
 2018-06-26 15:54:54 -05:00
CitrusGenderandletterjay d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
kevinz000andletterjay 4ffe025624 Cyborgs now drop radio keys on detonation/destruction (#38617) 
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
 2018-06-24 05:16:18 -05:00
kevinz000andGitHub a4a27204ae Update robot.dm 2018-06-19 14:46:26 -07:00
Tad Hardestyandletterjay b5478b6e9d Fix repairing Cyborg headlamp even when its panel is closed (#38550) 2018-06-18 09:35:41 -05:00
orangesandletterjay 69730f0a60 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-11 22:29:51 -05:00
kevinz000andletterjay 308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
deathride58andkevinz000 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
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa 832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
Poojawaanddeathride58 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
PoojawaandGitHub 75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05: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
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
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
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
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
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
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
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
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
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00