shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,686 Commits 5 Branches 0 Tags
c5cbfa64e5931e0cc8f971a95cc80f4a24478cee
Commit Graph

582 Commits

Author SHA1 Message Date
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
shellspeed1
9197cb4813 allows storage in medbelts and organ boxes. 2020-06-18 21:06:22 -07:00
shellspeed1
b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
Timothy Teakettle
2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
b1tt3r1n0
764ba26ace Pouches (#12432) 
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
 2020-06-09 03:22:39 -07:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Sonic121x
b7411bf9a0 Fix The X-01 Multiphase energy gun box (#12409) 
Fix /obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
 2020-05-31 13:50:31 +02:00
Ghom
48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392) 
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
 2020-05-31 00:54:28 -07:00
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155) 
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
 2020-05-30 03:17:56 +02:00
Ghom
ba3151bf1e Pills and pill bottles are now volumetric. (#12332) 2020-05-24 13:07:35 -07:00
Sonic121x
807a5c7d1e Fix stuff that no one care about (#12340) 
* Update bags.dm

* Fix instant crush

* tweak frame delay

tweak the 3 variant of shutters frame delay to 0.38 per frame,make it took roughly 10 tick to close completely.
 2020-05-23 14:48:39 +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
Ghom
9d2399ce9f Removing unused files and fixing some stuff. (#12250) 2020-05-15 07:15:15 -07:00
kevinz000
10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864) 
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
 2020-05-15 03:44:56 +02:00
kevinz000
5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376 
Buffs and corrects organ storage box
 2020-05-12 12:34:45 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Trilbyspaceclone
db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone
3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
Ghommie
88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Ghommie
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
kevinz000
57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Trilbyspaceclone
89bb18fe98 Update belt.dm 2020-04-25 00:50:03 -04:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
kevinz000
cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle 
re-adds north star gloves to traitors for 20 tc
 2020-04-23 11:45:04 -07:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
kiwedespars
842483190a Update code/game/objects/items/storage/uplink_kits.dm 
my brain is small when working git.

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2020-04-19 17:18:14 -07:00
kiwedespars
b21ee932cf maybe this is travis's issue? 2020-04-19 17:06:21 -07:00
kiwedespars
42fac43807 Merge branch 'master' into punch-bundle 2020-04-19 16:50:01 -07:00
kiwedespars
25e0c47225 oops 2020-04-19 16:48:37 -07:00
TrilbySpaceClone
25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
kiwedespars
c3905c8c2b Update uplink_kits.dm 2020-04-19 15:56:31 -07:00
Lin
d75e3f79bd Merge pull request #11917 from Ghommie/Ghommie-cit688 
Makes warm donk pockets cooling after 7 minutes canon again.
 2020-04-19 16:52:33 +00:00
Trilbyspaceclone
2039fb80e6 Update fancy.dm 2020-04-18 22:37:05 -04:00
Ghommie
8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. 2020-04-18 15:40:18 +02:00
kevinz000
7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff 
More mapping Loot tables and code improvements + Maints/Locker loot changes
 2020-04-17 05:51:26 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Trilbyspaceclone
e7247c6a60 Update wallets.dm 2020-04-14 10:11:37 -04:00
Trilbyspaceclone
5833ed8029 Merge branch 'master' into tools_andstuff 2020-04-14 10:10:32 -04:00