shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,088 Commits 5 Branches 0 Tags
751de19f6e7b5815e55393e3812e021dec0bd0a2
Commit Graph
32088 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 751de19f6e Automatic changelog generation for PR #11542 [ci skip] 2020-03-21 00:48:25 -05:00
kevinz000andGitHub 2127d4d7d4 Merge pull request #11542 from Trilbyspaceclone/patch-318 
Buffs Syndi Medical borgs
 2020-03-20 22:48:23 -07:00
CitadelStationBot f11fdb3ee7 Automatic changelog generation for PR #11512 [ci skip] 2020-03-21 00:46:47 -05:00
kevinz000andGitHub 82a4121807 Merge pull request #11512 from dapnee/Lambdastation 
Fuck it, Lambda Station, here we go!
 2020-03-20 22:46:45 -07:00
CitadelStationBot 6190129ca7 Automatic changelog generation for PR #11541 [ci skip] 2020-03-21 00:43:28 -05:00
kevinz000andGitHub f112331c62 Merge pull request #11541 from Seris02/xraydeath 
removes xray from the gene pool (webedit edition)
 2020-03-20 22:43:25 -07:00
CitadelStationBot 444419d5fa Automatic changelog generation for PR #11528 [ci skip] 2020-03-20 20:45:37 -05:00
kevinz000andGitHub 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
CitadelStationBot e81f8dc32c Automatic changelog generation for PR #11553 [ci skip] 2020-03-20 20:42:05 -05:00
kevinz000andGitHub 1bb0c01ff1 Hypereutactic blade properly slows you down again, adds set_slowdown() and hooks vv_edit_var for it (#11553) 
* ok

* Update items.dm
 2020-03-21 02:42:02 +01:00
kevinz000andGitHub 32bfdb6712 Update cit_screenshake.dm (#11554) 2020-03-21 01:52:39 +01:00
CitadelStationBot b775565a0a Automatic changelog generation for PR #11532 [ci skip] 2020-03-20 19:48:04 -05:00
zeroisthebiggayandGitHub 5d8f6163d5 fixes a box oopsies (#11532) 
* apparently i forgot them

* and also map merge

* two more minor issues

* and also map merge
 2020-03-21 01:48:01 +01:00
CitadelStationBot 8b81a73f90 Automatic changelog generation for PR #11547 [ci skip] 2020-03-20 17:44:01 -05:00
TrilbyspacecloneandGitHub 8d7f7541c0 correct Template Headers (#11547) 2020-03-20 23:43:58 +01:00
CitadelStationBot 53f2c780b3 Automatic changelog generation for PR #11352 [ci skip] 2020-03-20 10:09:13 -05:00
kevinz000andGitHub 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
CitadelStationBot 25c520d21b Automatic changelog generation for PR #11491 [ci skip] 2020-03-20 10:08:13 -05:00
Putnam3145GitHubGhom
 		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
CitadelStationBot fc6f43b680 Automatic changelog generation for PR #11507 [ci skip] 2020-03-20 10:07:07 -05:00
necromanceranneandGitHub 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
CitadelStationBot a01f8e9c07 Automatic changelog generation for PR #11534 [ci skip] 2020-03-20 09:52:12 -05:00
TrilbyspacecloneandGitHub 7ad1831b44 Update fermenting_barrel.dm (#11534) 2020-03-20 15:52:09 +01:00
CitadelStationBot e3990fc4cc Automatic changelog generation for PR #11539 [ci skip] 2020-03-20 09:47:49 -05:00
Putnam3145andGitHub 9523954c4d Rewrote waffle traitor flavor text (#11539) 
* Rewrote waffle flavor text

* and not in custody
 2020-03-20 15:47:46 +01:00
TrilbyspacecloneandGitHub 9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
TrilbyspacecloneandGitHub 95e0f0399a Update tools.dm 2020-03-20 01:47:42 -04:00
Seris02andGitHub 332099953b removes xray from the gene pool 2020-03-20 11:15:47 +08:00
Seris02andGitHub d3d5cb96ba Merge pull request #4 from Citadel-Station-13/master 
god I hope this is the right pr
 2020-03-20 11:14:58 +08:00
CitadelStationBot 415727c66c Automatic changelog generation for PR #11351 [ci skip] 2020-03-19 21:15:05 -05:00
kevinz000andGitHub 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
CitadelStationBot c179133059 Automatic changelog generation for PR #11527 [ci skip] 2020-03-19 20:56:35 -05:00
kevinz000andGitHub 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
CitadelStationBot 1d64a4d66f Automatic changelog generation for PR #11533 [ci skip] 2020-03-19 20:38:55 -05:00
TrilbyspacecloneandGitHub 581c537fba Update pen.dm (#11533) 2020-03-20 02:38:52 +01:00
CitadelStationBot 6b762c0b41 Automatic changelog generation for PR #11518 [ci skip] 2020-03-19 20:38:00 -05:00
necromanceranneandGitHub 2b11b7ac95 Energy Gun Sprite cleanup and Animations (#11518) 
* Sprite changes and animations by goldnharl

* While I'm here I'll port over a sprite from tg for the disabler
 2020-03-20 02:37:57 +01:00
kevinz000andGitHub 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
GhomandGitHub ddc7d11e6e Update living.dm 2020-03-19 15:34:23 +01:00
GhomandGitHub 6f6c162138 Update living.dm 2020-03-19 15:33:19 +01:00
GhomandGitHub bd8847ab66 Update living.dm 2020-03-19 15:32:46 +01:00
GhomandGitHub e9ad37fbd0 Update belly_obj.dm 2020-03-19 15:28:41 +01:00
CitadelStationBot 80875a41f6 Automatic changelog generation for PR #11520 [ci skip] 2020-03-19 07:40:15 -05:00
Seris02andGitHub 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
CitadelStationBot 71f48b3b35 Automatic changelog generation for PR #11517 [ci skip] 2020-03-19 07:38:34 -05:00
HatterhatGitHubHatterhat
 		ab7fc2dc72 me and the boys stealing prs (#11517) 
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-19 13:38:31 +01:00
GhomandGitHub 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
GhomandGitHub 6e9aff97ae b 2020-03-19 01:44:28 +01:00