shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,059 Commits 5 Branches 0 Tags
332099953b76e326f9d0fc4e1590c6d6dd3ffdd0
Commit Graph

20802 Commits

Author SHA1 Message Date
Seris02
332099953b removes xray from the gene pool 2020-03-20 11:15:47 +08:00
kevinz000
6e84781670 tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage (#11351) 
* Update stun.dm

* Update stun.dm

* Update stun.dm

* Update debuffs.dm
 2020-03-20 03:15:03 +01:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
Trilbyspaceclone
581c537fba Update pen.dm (#11533) 2020-03-20 02:38:52 +01:00
kevinz000
7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595 
Yeets the preferences_vore datum and migrates its stuff to preferences.
 2020-03-19 08:30:18 -07:00
Ghom
ddc7d11e6e Update living.dm 2020-03-19 15:34:23 +01:00
Ghom
6f6c162138 Update living.dm 2020-03-19 15:33:19 +01:00
Ghom
bd8847ab66 Update living.dm 2020-03-19 15:32:46 +01:00
Ghom
e9ad37fbd0 Update belly_obj.dm 2020-03-19 15:28:41 +01:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520) 
* yeet gone

* pfft oof

* oof
 2020-03-19 13:40:11 +01:00
Ghom
b03955b085 Update dueling.dm 2020-03-19 05:26:38 +01:00
Ghommie
adf092996c Merge branch 'Ghommie-cit628' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit628 2020-03-19 04:50:04 +01:00
Ghommie
a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01:00
Ghom
6e9aff97ae b 2020-03-19 01:44:28 +01:00
Ghommie
3aa3ed189a gunz 2020-03-18 23:53:10 +01:00
Ghommie
0285b4cee4 > virtual gf 2020-03-18 23:49:19 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
nik707
9b71b1a9a2 Merge pull request #11511 from EmeraldSundisk/cogshuttles 
Let's just start with the shuttles.
 2020-03-18 14:37:27 -05:00
kevinz000
6758761a65 Update action.dm (#11521) 2020-03-18 19:44:33 +01:00
Hatterhat
1e10a042be arrow craft nitpicking (alt title: "why are subtypes like this") (#11516) 
* subtypes (tm)

* ok fine jeez

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-18 19:34:14 +01:00
kevinz000
88bb9d8f1d Update sword_point.dm (#11523) 2020-03-18 19:20:56 +01:00
kevinz000
8fbdae375c Merge pull request #11494 from Detective-Google/hudpatches 
Adds craftable HUDpatches, similar to the HoS'
 2020-03-18 03:35:28 -07:00
kevinz000
c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
Lin
1649f42570 bruh 2020-03-18 01:24:54 +00:00
Detective Google
6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google
af872d1476 push 2020-03-17 16:10:15 -05:00
kevinz000
fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5 
Positronic overlays fix.
 2020-03-17 09:29:39 -07:00
kevinz000
00e0683889 Merge pull request #11501 from Citadel-Station-13/Ghommie-patch-4 
Ports "Makes iron sheets build the normal metal table again"
 2020-03-17 09:29:29 -07:00
kevinz000
7a9525d7c7 Merge pull request #11499 from Citadel-Station-13/Ghommie-patch-3 
Fixing right click / verb set_APTFT
 2020-03-17 09:29:17 -07:00
kevinz000
039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins 
Ash walker camp tweak because Ghommie asked me to.
 2020-03-17 09:29:05 -07:00
kevinz000
4374b09a12 Merge pull request #11493 from Trilbyspaceclone/patch-311 
Blacklists two custom item flasks in "get drink" proc
 2020-03-17 09:28:24 -07:00
kevinz000
2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626 
Shortcut fix for a sticky situation.
 2020-03-17 09:28:01 -07:00
kevinz000
ade399dc31 Merge pull request #11486 from Citadel-Station-13/Ghommie-patch-2 
Webedit fixing a runtime.
 2020-03-17 09:27:36 -07:00
kevinz000
0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix 
Fixes being unable to remove turret guns
 2020-03-17 09:26:04 -07:00
kevinz000
a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff 
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
 2020-03-17 09:25:51 -07:00
kevinz000
8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix 
Electrostaff Sprite Fix
 2020-03-17 09:25:44 -07:00
kevinz000
2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix 
Replaced and added missing Diagnostic HUDSunglasses sprites
 2020-03-17 09:25:32 -07:00
EmeraldSundisk
d8e82c03ef Update shuttles.dm 2020-03-17 08:36:28 -07:00
EmeraldSundisk
dfe73565a1 Revert "shut" 
This reverts commit 7502cec756.
 2020-03-17 08:33:53 -07:00
EmeraldSundisk
7502cec756 shut 2020-03-17 08:19:45 -07:00
kevinz000
1585b34e41 Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1 
Fixing a couple issues with recyclers.
 2020-03-16 13:23:46 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
kevinz000
2e90761f88 Merge pull request #11482 from Ghommie/Ghommie-cit624 
fixing missing icon issues for some survival pod machinery.
 2020-03-16 13:23:06 -07:00
kevinz000
fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623 
Banana pies, beams. runtime errors and warnings.
 2020-03-16 13:22:49 -07:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
necromanceranne
fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Ghom
a505806ef2 No comment. 2020-03-16 17:13:56 +01:00
Ghom
a24a67e489 Update reagent_containers.dm 2020-03-16 17:07:30 +01:00