shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,105 Commits 5 Branches 0 Tags
cee15792b7edef93bec4db170cbbe9ee49839fd2
Commit Graph
1867 Commits
Author SHA1 Message Date
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
Putnam3145andGitHub 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
siliconsandGitHub 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
GhomGitHubTimothy Teakettle
 		c003904600 Update code/game/machinery/doors/door.dm 
Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
 2020-06-26 19:14:20 +02:00
Ghommie 09ce081565 Based chicken simple mob reveals issue with code. 2020-06-26 19:11:23 +02:00
Ghommie 8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02: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
siliconsandGitHub 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
kevinz000 1b5ea90c8f sigh 2020-06-18 08:16:05 -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 TeakettleandGitHub 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
LinandGitHub bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
Timothy Teakettle 34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle 4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
GhomandGitHub 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
GhomandGitHub 575609ca8a Fixing my fix for reclyclers. (#12422) 
* Fixing my bad fix for the recycler.

* rework.

* Ok
 2020-06-02 15:29:32 -07:00
GhomandGitHub a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) 
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
 2020-06-02 15:22:06 -07:00
Letter NandGitHub 1fc73700c5 Telecomms TGUI (#12145) 
* aaaaaa

* branch hell

* time to sync

* build

* adds more """functionality""" for telemonitor

* messaging pda thing

* bakes tgui

* someone didn't finish the code for req. consoles

* go use [TELECOMM STUFF].on, it's better

* build stuff

* a

* interface for teleinteraction

* tgui

* ready for launch - not tested yet

* build

* built ui

* bitflag readability and bye oldcode!

* bepis

* build ui
 2020-06-01 00:22:40 +02:00
Ghommie 9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07: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
Chayse RamsayGitHubChangelogs
 		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
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
LinandGitHub 8be491f32f change layer (#12377) 2020-05-28 00:37:09 -07:00
GhomandGitHub cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
GhomandGitHub bc4e4ca9f3 Fixing an issue with wooden barricades / wood sheets interaction (#12360) 2020-05-28 00:35:40 -07:00
LinandGitHub f7864a9245 Merge pull request #12366 from KathrinBailey/Soft-floors-for-soft-paws 
Fix: Radiation Shutters
 2020-05-27 22:39:09 +00:00
KathrinBailey 7b1e3204fb Fixes radiation shutters. 
Changes rad_insulation from 0.2 to -0.5
This should make shutters actually work. It won't protect you from extreme radiation from things such as delaminating supermatters.
 2020-05-26 11:32:23 +01:00
GhomandGitHub 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
GhomandGitHub 292f1afa3c Quick bandaid for table telescreens/buttons. (#12339) 2020-05-24 13:13:20 -07:00
GhomandGitHub ce1f1bdf5e Turning a few components into elements. (#12325) 
* Turning a few components into elements.

* eh
 2020-05-24 13:06:27 -07:00
GhomandGitHub 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
Sonic121xandGitHub 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
TrilbyspacecloneandGitHub 42e6fccde0 Buffs space heaters (#12241) 
* Update spaceheater.dm

* Update spaceheater.dm
 2020-05-18 02:31:31 +02:00
GhomandGitHub 68cd016067 Demodularizing wishgranter, some helpers, and removing unused files. (#12291) 2020-05-17 17:06:05 -07:00
GhomandGitHub 335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
GhomandGitHub 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 1bf1352383 Linter 2020-05-17 18:59:50 +02:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
kevinz000andGitHub b6a74288b9 [s] cryogenics logging (#12264) 
* Update cryopod.dm

* Update admin_investigate.dm

* Update logging.dm

* Update cryopod.dm

* how asleep was i last night gamers

* Update cryopod.dm
 2020-05-16 05:00:26 +02:00
GhomandGitHub 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
Ghommie fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00