shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,624 Commits 5 Branches 0 Tags
3687ef2d331af4a426a81ccc097b3f31bfcd4ec9
Commit Graph
134 Commits
Author SHA1 Message Date
KorPhaeronandCitadelStationBot 31f6898a87 Stops AIs from giving the borg a free secondary light (#30913) 
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
 2017-09-24 17:58:37 -05:00
LetterJayandGitHub cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
RobustinandCitadelStationBot 894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBotandPoojawa a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBotandPoojawa 2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
LetterJayandGitHub c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
orangesandCitadelStationBot 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBotandPoojawa d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBotandPoojawa 680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825) 
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
 2017-09-17 22:59:33 -05:00
PoojawaandGitHub dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818) 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
 2017-09-17 11:56:55 -05:00
CitadelStationBotandPoojawa 35fc9d0391 [MIRROR] Fixes pAI integrated light (#2764) 
* Fixes pAI integrated light (#30690)

* Fixes pAI integrated light
 2017-09-14 13:22:27 -05:00
CitadelStationBotandPoojawa e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
LetterJayandGitHub a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJayandGitHub c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJayandGitHub 4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJayandGitHub 16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
KorPhaeronandCitadelStationBot 4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJayandGitHub c1872907b1 Update robot_modules.dm 2017-09-11 13:10:18 -05:00
LetterJayandGitHub ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
vuonojenmustaturskaandCitadelStationBot 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
CitadelStationBot 50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
LetterJayandGitHub 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJayandGitHub ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot 3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBotandkevinz000 90a7ead961 [MIRROR] The AI's internal camera functions better (#2219) 
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
 2017-08-05 10:24:58 -07:00
CitadelStationBotandkevinz000 1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
CitadelStationBotandkevinz000 91a44d4c35 Makes cyborg remote interaction limited. (#2230) 2017-08-03 06:02:15 -07:00
CitadelStationBotandPoojawa dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot 6cb9444588 Fixes silicons not returning an Initialize hint 2017-08-01 18:10:59 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000andGitHub bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
CitadelStationBot d3f488a5ee Cyborgs grabbing ore works consistently 2017-07-31 07:10:17 -05:00
LetterJayandGitHub 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot 4e6e4faed8 Adds a mini fire extinguisher to janitor and service borgs 2017-07-26 15:45:10 -05:00
CitadelStationBot 484ea6d20f Converted borgs will properly show the glowing eye message at distances of 1 2017-07-20 22:25:53 -05:00