shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,691 Commits 5 Branches 0 Tags
744b6d6b48b36588fe145fa27719ff3eaeccea29
Commit Graph

1255 Commits

Author SHA1 Message Date
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Sonic121x
b128a21309 Paramedic jump suit adjust 
paramedic jump suit now adjust able.
light version of paramedic jump suit now have a digitigrade version
 2020-07-13 20:33:59 +08:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Sneakyrat6
3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
silicons
dbf88a1408 Merge pull request #12676 from Ghommie/Ghommie-cit829 
Improvements to the recent clothing menu toggle hardsuit helmet feature.
 2020-07-04 00:12:29 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828 
Fixing (un)equip penalties from obscured inv slots.
 2020-07-04 00:12:04 -07:00
Ghommie
92c846fdbf Improvements to the recent clothing menu toggle hardsuit helmet feature. 2020-07-03 01:08:28 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
Sonic121x
4ca695020a add adigitigrade version of captain's female formal outfit. 2020-07-02 23:21:31 +08:00
Sonic121x
6240ade87d Add digitigrade version of cmoturtleneck 2020-07-02 23:20:01 +08:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
silicons
9f6d0ba10b Merge pull request #12570 from NopemanMcHalt/orvilike_bonus 
Adds Kepi and Orvilike Kepi
 2020-06-24 08:43:03 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Anonymous
9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous
45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Timothy Teakettle
7f2155ea2e fix sprite 2020-06-15 21:44:18 +01:00
Timothy Teakettle
3811fcbcf1 some fixes 2020-06-15 21:30:14 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom
37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
NopemanMcHalt
e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447) 
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
 2020-06-08 09:14:19 -07:00
Lin
5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811 
Fixing various icons problems with some clothings.
 2020-06-03 20:23:16 +00:00
Ghom
d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
Ghommie
1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348) 
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
 2020-05-27 18:01:22 -07:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
Ghom
c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02:00
Ghom
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat 
Adds a paramedic wintercoat
 2020-05-21 19:26:31 +00:00
Trilbyspaceclone
7337993d8e Lavaland Gear Tweaks - Armor balancing (#12270) 
* lava land tweaks

* Reverts Exo suit touches

5% isnt worth that much, so might as well give it back

* Update miscellaneous.dm

* Reverts the ERT based gear
 2020-05-20 18:47:30 -07:00
Ghom
4c3dac467f Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. (#12289) 
* Mining inquisitor/berserker hardsuit nerf, slight drake armor buff.

* Pretty unlikely you'll be hit by more than a handful spells in a single round.

* aaaa

* Update miscellaneous.dm
 2020-05-18 16:55:40 -07:00
kevinz000
810da1b7c8 changes 2020-05-18 04:41:10 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00