shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,652 Commits 5 Branches 0 Tags
18471be4ce24f79831764a4548ea5a554d0aca93
Commit Graph

13429 Commits

Author SHA1 Message Date
kevinz000
18471be4ce cult team 2020-03-10 20:11:18 -07:00
kevinz000
a43f9ec7be refactor time fuck you 2020-03-10 19:57:30 -07:00
kevinz000
ce8de536b5 Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-10 17:24:09 -07:00
kevinz000
f5fd4733e1 Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1 
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
 2020-03-10 17:14:51 -07:00
Ghom
d55f7aba42 Merge pull request #11401 from Trilbyspaceclone/bow_sprites 
Gives pipe and ashen bow inhand sprites
 2020-03-11 00:03:29 +01:00
Ghom
48ff2f2cec Merge pull request #11349 from monster860/pixel_erp 
Pixel shifting for ERP
 2020-03-10 18:01:52 +01:00
Ghom
aaf494c66b Update code/modules/mob/mob_defines.dm 
Co-Authored-By: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-03-10 17:37:39 +01:00
Ghom
424a3d9668 Merge pull request #11399 from Seris02/lizardtailfixes 
normalising wagging tail names for a very specific bug fix
 2020-03-10 16:59:55 +01:00
Ghom
c86124f8ed Update human.dm 2020-03-10 14:34:17 +01:00
kevinz000
832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20 
Food Ports / Butter Bear / Food Craft Speed
 2020-03-10 05:59:24 -07:00
kevinz000
41fdaae32c Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo 
makes ghost hud default to on and ghost darkness defaults to on
 2020-03-10 05:58:43 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000
d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice 
syndicate elite hardsuit helmet doesnt hide masks anymore
 2020-03-10 05:57:27 -07:00
kevinz000
1b7eaf48eb Merge pull request #11395 from Citadel-Station-13/Ghommie-patch-4 
Shuttle timer display seconds fix
 2020-03-10 05:56:56 -07:00
kevinz000
bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 
Ports "Switches out the three billion args of electrocute act for flags"
 2020-03-10 05:56:28 -07:00
kevinz000
aca1d70bbb Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy 
syndicate contractor helmets are no longer secretly lead
 2020-03-10 05:56:08 -07:00
Winter Flare
8a452b7f09 Food Craft Speed 2020-03-10 01:43:18 -04:00
Winter Flare
9ec222e5b4 Empowered Burger 2020-03-10 00:53:42 -04:00
kevinz000
bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614 
Porting more legcuffs / bola fixes etcetera
 2020-03-09 21:01:51 -07:00
kevinz000
f444020741 Merge pull request #11403 from Citadel-Station-13/Ghommie-patch-1 
[s] Ports "Fixes gibber part update"
 2020-03-09 19:28:02 -07:00
Ghom
80eaf3be0d Update _drone.dm 2020-03-09 22:22:38 +01:00
Ghom
0400fbf8a2 Update constructs.dm 2020-03-09 22:21:32 +01:00
Trilbyspaceclone
8e030763b6 Odd but ok? 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-09 12:38:45 -04:00
Ghom
29346f7827 Merge pull request #11371 from keronshb/BlobRefactor 
Blob refactor + reroll ports
 2020-03-09 17:07:45 +01:00
Ghom
503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit 
tauric contractor space suits
 2020-03-09 16:50:32 +01:00
Ghom
ea556e6357 [s] Ports "Fixes gibber part update" 2020-03-09 16:41:56 +01:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
TrilbySpaceClone
4968c22b5f sprites! 2020-03-09 08:47:56 -04:00
Seris02
68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
kevinz000
3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing bloodsucker mesmerize
 2020-03-08 21:29:10 -07:00
ZeroMan
c079dba753 its a fucking helmet 2020-03-08 23:07:24 -04:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb
7e1e905a95 Line ending changes, I hope 
here goes nothing.
 2020-03-08 20:36:05 -04:00
Ghom
f1d6360b70 Shuttle timer display seconds fix 2020-03-09 01:31:39 +01:00
keronshb
0d3da4fcc0 maybe? last go? 2 
Should be the final part I hope
 2020-03-08 20:11:13 -04:00
keronshb
94958581b9 maybe? last go? 
maybe? last go?
 2020-03-08 20:10:34 -04:00
keronshb
fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Pne more test go
 2020-03-08 19:48:30 -04:00
Ghom
1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
keronshb
7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
Trying to fix this shit again
 2020-03-08 19:17:28 -04:00
Ghom
1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00
keronshb
d460f5359e Hopefully this will fix it? 
Hopefully this will fix it?
 2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11 Trying to see if this will fix the line end issue 
Trying to see if this will fix the line end issue
 2020-03-08 18:48:42 -04:00
Ghom
187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
ZeroMan
388891bde3 fianlly ive discovered obanium 2020-03-08 18:31:12 -04:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
To fixs something?
 2020-03-08 17:51:17 -04:00
ZeroMan
1941169582 will this fucking work 2020-03-08 15:45:35 -04:00
Winter Flare
bb9066e9cb Food Additions / Butter Bear 
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
 2020-03-08 14:36:08 -04:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00