shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,736 Commits 5 Branches 0 Tags
dcdda5451eae1a97c63c14bf9ca079fcd6db8685
Commit Graph

33736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000 dcdda5451e Merge pull request #12146 from Trilbyspaceclone/patch-368 
slows down ice demons
 2020-05-08 23:29:50 -07:00
kevinz000 5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729 
Demodularizing a few sprite assets.
 2020-05-08 23:29:34 -07:00
kevinz000 cfcac55654 Merge pull request #12142 from Ghommie/Ghommie-cit728 
Demodularizing the arousal module.
 2020-05-08 23:29:16 -07:00
kevinz000 c435c6b6a8 Merge pull request #12158 from Trilbyspaceclone/helper-text 
What if mechs give more information?
 2020-05-08 23:29:01 -07:00
kevinz000 712b278a8e Merge pull request #12156 from Citadel-Station-13/Ghommie-patch-3 
Fixing a whoopsie with args in some skill proccalls.
 2020-05-08 23:28:45 -07:00
kevinz000 c92eaf805a Merge pull request #12153 from Citadel-Station-13/Ghommie-patch-1 
Quick webedit fixing thousand stack_trace reports.
 2020-05-08 23:28:06 -07:00
kevinz000 1be722d53f Merge pull request #12163 from Citadel-Station-13/Ghommie-patch-5 
Fixing rechargers not putting the item in hands
 2020-05-08 23:27:37 -07:00
kevinz000 75bcebde36 Merge pull request #12162 from Citadel-Station-13/Ghommie-patch-4 
Quick PR fixing fireman carry.
 2020-05-08 23:27:25 -07:00
kevinz000 d309bc5e74 Instruments no longer keep updating if you aren't holding them etc etc (#12165) 
* Update _song.dm

* Update item.dm
 2020-05-09 03:15:42 +02:00
MrJWhit 2a9746b34a Pubby atmos opening up (#12117) 
* First update, atmos control room

* finalization

* Final bugfixes

* final update
 2020-05-09 02:55:07 +02:00
Hatterhat 6067370a6f shotgun shell clips (#11955) 
* shell clips revised by based ghom

* lmao yeet better not forget that bit

* nitpicking but also merge 11976 first

* No freeloaders.

* Update weapon_designs.dm

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-09 02:49:25 +02:00
Seris02 381333bf82 a (#11873) 2020-05-09 02:15:41 +02:00
kappa-sama cab55f8549 alternate buff (#11867) 2020-05-09 02:14:18 +02:00
Putnam3145 3531459d8b Some trauma rebalancing (#12144) 
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
 2020-05-09 01:42:39 +02:00
kevinz000 3a8e9da73b Fixes projectiles going sanic (#12167) 
* ok

* woops
 2020-05-09 01:27:26 +02:00
Suicidalpickles 2d9aac8f31 cakehat cat wearing a cakehat while patting a cak (#12166) 
fix
 2020-05-09 00:40:07 +02:00
Lin ab8342d453 Merge pull request #12141 from Trilbyspaceclone/patch-367 
Corrects medical packet crafting
 2020-05-08 21:27:43 +00:00
Ghom 97c5eb9b8f Fixing chargers not putting the item in hands 2020-05-08 22:20:54 +02:00
Ghom 2650df11d5 Update riding.dm 2020-05-08 22:12:27 +02:00
Trilbyspaceclone 43f6acd81b *crys* 2020-05-08 15:42:35 -04:00
Trilbyspaceclone a711f312ce Update mecha_construction_paths.dm 2020-05-08 15:37:17 -04:00
Trilbyspaceclone c9f8f55945 Update mecha_construction_paths.dm 2020-05-08 15:29:20 -04:00
Trilbyspaceclone e0d56363d4 Update mecha_construction_paths.dm 2020-05-08 15:13:13 -04:00
Trilbyspaceclone 5ab1d04154 Update mecha_construction_paths.dm 2020-05-08 14:44:27 -04:00
Trilbyspaceclone 9caa236e85 Update mecha_construction_paths.dm 2020-05-08 14:22:15 -04:00
TrilbySpaceClone 47319cc8c9 What if mechs give more information? 2020-05-08 11:28:39 -04:00
Ghom 73d958649e Update item_attack.dm 2020-05-08 17:12:13 +02:00
Ghom 7616887604 Update mood.dm 2020-05-08 16:13:57 +02:00
Putnam3145 602154abe8 Fixes cloner sabotage to only check on station Z (#12140) 2020-05-08 15:48:23 +02:00
Trilbyspaceclone a6bf258f5c Update ice_demon.dm 2020-05-08 04:33:40 -04:00
kevinz000 61692f290a Merge pull request #12121 from Ghommie/Ghommie-cit723 
Generic skills support for items, level based skill type. Wiring skill.
 2020-05-08 01:24:44 -07:00
kevinz000 43dc1319d9 Merge pull request #12097 from Ghommie/Ghommie-cit720 
Implementing the NO_PUBLIC_LATHE build_type flag.
 2020-05-07 21:04:57 -07:00
Lin ae3b2a58f9 Merge pull request #12129 from Ghommie/Ghommie-cit726 
Fixing some sprite issues and nit-picks.
 2020-05-08 03:00:20 +00:00
Ghommie aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
kevinz000 51081fcb1a ok (#12083) 2020-05-08 03:36:08 +02:00
Ghommie 192c0dcc1a Demodularizing the arousal module. 2020-05-08 03:35:29 +02:00
Ghommie 3dfef3c393 . 2020-05-08 02:50:14 +02:00
Ghommie 4041fce0f7 whops. 2020-05-08 02:30:57 +02:00
Ghommie ddb50e2845 colors. 2020-05-08 02:24:49 +02:00
Ghommie 835753a02d ! 2020-05-08 02:14:07 +02:00
Ghommie 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Trilbyspaceclone 80687bb17f Update recipes_misc.dm 2020-05-07 18:00:50 -04:00
Trilbyspaceclone 86fc39a777 le sigh 2020-05-07 17:55:25 -04:00
Ghommie 74e7f7ea46 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726 2020-05-07 22:14:11 +02:00
Putnam3145 5e0235bd76 Merge pull request #12139 from Citadel-Station-13/kevinz000-patch-8 
Fixes VSC debugger
 2020-05-07 10:51:04 -07:00
kevinz000 2a33060c98 Update world.dm 2020-05-07 10:44:45 -07:00
kevinz000 4b143ac9af Merge pull request #12098 from Ghommie/Ghommie-cit721 
Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them"
 2020-05-07 09:21:14 -07:00
Ghom a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
kevinz000 7c54da65a2 The great material rebalance (#12123) 
* haha bet

* Update stock_parts.dm

* ok
 2020-05-07 18:16:14 +02:00
kevinz000 7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722 
Removing cargo "paperwork" and a few other bloat packs.
 2020-05-07 09:11:45 -07:00