shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

69 Commits

Author SHA1 Message Date
Ghom
26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
Ghom
89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
Winter Flare
1a994e7f1e Ports Broom, Tweak Janitor Vendor 
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
 2020-02-17 23:36:22 -05:00
kevinz000
70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
Linzolle
c5bbce0928 add the BOW 2020-02-09 18:36:36 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
nik707
be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields 
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
 2020-01-01 20:28:15 -06:00
Hatterhat
5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
Trilbyspaceclone
4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Winter Flare
03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy
e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
lolman360
645b8ddf39 cmo: the new CE 
loot him for tools
 2019-10-09 13:32:45 +11:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
lolman360
ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
Winter Flare
04c302b08e Service Tweaks 
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
 2019-08-15 06:28:46 -04:00
lolman360
b283a0979c yay 2019-08-11 14:56:42 +10:00
lolman360
e2e7133eba ew things are called different things 2019-08-11 14:54:17 +10:00
lolman360
f131104a73 Add files via upload 2019-08-11 10:51:38 +10:00
Ghommie
16afae1e14 boolean 2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Ghommie
a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
kevinz000
2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176 
Adds a Rapier for 8 Trilby cats
 2019-07-14 14:46:44 -07:00
Trilbyspaceclone
6ad0a0ba0d Update belt.dm 2019-06-26 20:14:05 -04:00
Trilbyspaceclone
6b173432b2 Update belt.dm 2019-06-26 20:09:37 -04:00
TrilbySpaceClone
05416b8f53 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176 2019-06-23 13:00:17 -04:00
Fermi
095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Useroth
18c31ef22b Fixed the rapier sprites. 2019-06-11 00:39:56 +02:00
Trilbyspaceclone
cc2240366e Update belt.dm 2019-06-10 17:33:08 -04:00
Fermi
b6788cdd64 Updated projectile sprite. 2019-06-08 01:45:32 +01:00
Fermi
26e55a7a42 Swapped stacking to FALSE 2019-06-08 01:40:13 +01:00
Fermi
f44b9048af Added to vendors/tech. 2019-06-08 01:00:51 +01:00
Fermi
000b930811 Added Medolier (needs sprite) 2019-06-07 00:19:28 +01:00
Poojawa
d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938) 
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-02-08 05:26:42 -08:00
Trilbyspaceclone
964f2f75d3 triv rethink 2018-12-06 18:39:01 -05:00
Trilbyspaceclone
5f3d9cfa7e syndicate bombs can now spawn in snack vests 2018-12-06 18:24:46 -05:00
81Denton
2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05: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
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00