shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,110 Commits 5 Branches 0 Tags
03b88acbdb1d3091c8b38eba693e0496d9ea35dc
Commit Graph
91 Commits
Author SHA1 Message Date
Redtail 4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
Poojawa d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
Letter Nandkevinz000 abc32ed0df adds "cap's female formal outfit" (#7307) 
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
 2018-07-04 05:37:01 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJayandGitHub fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
Tlaltecuhtliandletterjay 1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
Dax Dupontandletterjay bde58b5442 Fixes missing creampies (#38490) 2018-06-16 06:19:45 -05:00
CitadelStationBotandkevinz000 e68fbe9fa4 [MIRROR] Readds actual fun to admins throwing around drop pods (#7052) 
* Readds actual fun to admins throwing around drop pods (#38374)

* Readds fun

* Fun

* Readds actual fun to admins throwing around drop pods
 2018-06-10 12:28:38 -07:00
MrDoomBringerandletterjay 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
MrDoomBringerandletterjay 678e429dbf Adds a Supplypod-delivery admin smite (#38069) 
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
 2018-06-04 00:37:24 -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
CitadelStationBotandkevinz000 7bb6bc8dd3 [MIRROR] HoP/QM have access to vault (#6818) 
* Vault Access for QM (#37880)

* HoP/QM have access to vault

* Update captain.dm
 2018-05-27 17:25:18 -07:00
ShizCalevandletterjay 786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
Wilchenxandletterjay 85ef262082 Removes firing-pins box in RD's locker (#37906) 
Makes no sense since science can't print any guns and probably won't ever be able to again.
 2018-05-21 16:36:04 -05: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
vuonojenmustaturskaandCitadelStationBot 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa e52e52fa5d Removes the old hypospray from CMO closet, updates tator objective 2018-03-21 20:37:29 -05:00
PoojawaandGitHub 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
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
kevinz000andCitadelStationBot 91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Chayse RamsayandGitHub 0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
Chayse Ramsay a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
CitadelStationBotandPoojawa 92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291) 
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
 2018-02-05 05:36:09 -06:00
Poojawa f8b030f18f Can't trust people not to cause problems. 2018-02-04 19:11:10 -06:00
Poojawa 40c98ad9ff adds sickshot to the same lockers as defibs 2018-02-03 10:40:42 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
MrDoomBringerandCitadelStationBot 8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Jordan BrownandCitadelStationBot 5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest 
fixes supply drop pods being impossible to dissassemble
 2018-01-19 09:43:21 -06:00
IamgoofballandCitadelStationBot a5a1838bcb Rocket Pods now require manual disassembly (#34374) 
Bluespacing out simply wasn't metal enough tbh
 2018-01-14 21:59:20 -06:00
orangesandCitadelStationBot 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05: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
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58andGitHub bc4b689d56 Update medical.dm 2017-12-08 12:23:03 -05:00
Ashe HiggsandCitadelStationBot 315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
ACCountandCitadelStationBot f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ShizCalevandCitadelStationBot 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
Michiyamenotehifunana 6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
Michiyamenotehifunana d0a28fcd62 NERF EVERYTHING 
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
 2017-10-30 15:01:37 +08:00
LetterJayandGitHub 1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns 
Recolorable Guns and more ballistics for Security
 2017-10-29 23:43:20 -04:00
Michiyamenotehifunana 5071b3438c RECOLORABLE GUN MEMES 
Includes new ammo types, recolorable guns, partially recolorable guns, non-recolorable guns, and implementations into the map.
 2017-10-19 18:30:44 +08:00