shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,127 Commits 5 Branches 0 Tags
277af2a7bfe3bfd5318c79473c691e6cb144c9cc
Commit Graph
32127 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DeltaFire 277af2a7bf Vanguard heals stam too now 
2 stam per tick = 10 stam per second, going to add a tradeoff simillar to the stun absorb one too probably
 2020-03-21 17:14:22 +01:00
kevinz000andGitHub 87314b5d4d Merge pull request #11530 from Ghommie/Ghommie-cit629 
shapes and sizes sanitized.
 2020-03-21 07:32:53 -07:00
CitadelStationBot 92fc94105a Automatic changelog generation for PR #11548 [ci skip] 2020-03-21 09:32:02 -05:00
necromanceranneandGitHub 94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
CitadelStationBot b183a1ac53 Automatic changelog generation for PR #11545 [ci skip] 2020-03-21 09:07:35 -05:00
TrilbyspacecloneandGitHub 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
Ghommie 6c6b2a42eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629 2020-03-21 15:04:35 +01:00
CitadelStationBot 9b05fb854c Automatic changelog generation for PR #11540 [ci skip] 2020-03-21 01:23:29 -05:00
kevinz000andGitHub ac4ebfa2b4 Merge pull request #11540 from zeroisthebiggay/uplinkclothinggetssuckies 
Ports Syndicate Sneaksuits and buffs the paramedic gloves with some other things vaguely relating to armor
 2020-03-20 23:23:26 -07: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
CitadelStationBot 9c40389e4f Automatic changelog generation for PR #11529 [ci skip] 2020-03-21 00:57:46 -05:00
kevinz000andGitHub d1da7c8131 Merge pull request #11529 from Trilbyspaceclone/patch-312 
Small pipes
 2020-03-20 22:57:43 -07:00
kevinz000andGitHub cc8d8da0fe Merge pull request #11531 from Ghommie/Ghommie-cit630 
Removing some egg-celent unused preferences.
 2020-03-20 22:56:19 -07:00
CitadelStationBot 83c5e09aeb Automatic changelog generation for PR #11537 [ci skip] 2020-03-21 00:54:31 -05:00
kevinz000andGitHub 8a8b6efb39 Merge pull request #11537 from Trilbyspaceclone/patch-317 
Badass Glasses
 2020-03-20 22:54:28 -07:00
CitadelStationBot 8269072df7 Automatic changelog generation for PR #11538 [ci skip] 2020-03-21 00:54:17 -05:00
kevinz000andGitHub bf1f2c3984 Merge pull request #11538 from Ghommie/Ghommie-cit631 
Resprited specific sprite_accessory icon states.
 2020-03-20 22:54:14 -07:00
CitadelStationBot 2f128c04a2 Automatic changelog generation for PR #11544 [ci skip] 2020-03-21 00:48:48 -05:00
kevinz000andGitHub e687c7cefc Merge pull request #11544 from Trilbyspaceclone/patch-319 
New Old Ninja Steal Goals
 2020-03-20 22:48:45 -07:00
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
ZeroMan 2978014a64 i require cocknball tortures 2020-03-20 14:09:28 -04:00
ZeroMan 2c0d399e15 i am actually crying 2020-03-20 14:08:32 -04: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
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