shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,117 Commits 5 Branches 0 Tags
2bfc9b8ef886afdd07a63cd60eb87d0048031a92
Commit Graph

13621 Commits

Author SHA1 Message Date
Trilbyspaceclone
2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545) 
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
 2020-03-21 15:07:32 +01:00
ZeroMan
6c5160ee5c i hurt myself today 2020-03-21 02:18:44 -04:00
ZeroMan
93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
 2020-03-21 02:17:13 -04:00
kevinz000
cc8d8da0fe Merge pull request #11531 from Ghommie/Ghommie-cit630 
Removing some egg-celent unused preferences.
 2020-03-20 22:56:19 -07:00
kevinz000
8a8b6efb39 Merge pull request #11537 from Trilbyspaceclone/patch-317 
Badass Glasses
 2020-03-20 22:54:28 -07:00
kevinz000
2127d4d7d4 Merge pull request #11542 from Trilbyspaceclone/patch-318 
Buffs Syndi Medical borgs
 2020-03-20 22:48:23 -07:00
kevinz000
4eaa3a22c2 fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528) 
* wew

* ah

* k

* k

* faster
 2020-03-21 02:45:34 +01:00
ZeroMan
5039bcad7e i need an ambulance 2020-03-20 13:39:20 -04:00
ZeroMan
b30f10742b i actually am hurt 2020-03-20 13:38:08 -04:00
ZeroMan
bc5e850516 i still feel pain 2020-03-20 13:35:55 -04:00
ZeroMan
96d897a0fb i hurt myself today 2020-03-20 13:33:07 -04:00
kevinz000
225d5a3c40 Nerfs HoS taser and warden stun pump action blaster (#11352) 
* Update stun.dm

* Update pumpenergy.dm
 2020-03-20 16:09:10 +01:00
Putnam3145
6fffb4045b Make mass hallucination more admemeable (#11491) 
* Make mass hallucination more admemeable

* makes it work

* Update code/modules/events/mass_hallucination.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-20 16:08:11 +01:00
necromanceranne
570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
Trilbyspaceclone
7ad1831b44 Update fermenting_barrel.dm (#11534) 2020-03-20 15:52:09 +01:00
Putnam3145
9523954c4d Rewrote waffle traitor flavor text (#11539) 
* Rewrote waffle flavor text

* and not in custody
 2020-03-20 15:47:46 +01:00
Trilbyspaceclone
9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
Trilbyspaceclone
95e0f0399a Update tools.dm 2020-03-20 01:47:42 -04:00
ZeroMan
dd40bc28c1 and here we go 2020-03-19 22:17:43 -04: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
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04: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
Trilbyspaceclone
64ccb99724 Update uplink_badass.dm 2020-03-19 18:00:45 -04:00
Ghommie
eeab3ed11f Everyday 2020-03-19 17:34:01 +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
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
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
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
2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626 
Shortcut fix for a sticky situation.
 2020-03-17 09:28:01 -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
2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix 
Replaced and added missing Diagnostic HUDSunglasses sprites
 2020-03-17 09:25:32 -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