shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,438 Commits 5 Branches 0 Tags
225d435efdff520a9708d6b4e49371d2ee3fcf3a
Commit Graph

19438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
225d435efd Merge pull request #8015 from Trilbyspaceclone/patch-62 
Adds A Valentine Crate And Candy Crate
 2019-02-20 20:18:42 -05:00
deathride58
81c9c5078f Merge pull request #8013 from Citadel-Station-13/kevinz000-patch-24 
fixes admin permission R_EVERYTHING
 2019-02-20 20:18:04 -05:00
deathride58
69db11e747 Merge pull request #8028 from BlackMajor/master 
FUCK (Speedmerge plz)
 2019-02-20 19:51:31 -05:00
BlackMajor
778c87545c FUCK 
Gay typo
 2019-02-21 13:30:31 +13:00
deathride58
59a982466f Merge pull request #8022 from BlackMajor/master 
Plushtide 2: Electric Boogaloo
 2019-02-20 19:21:34 -05:00
CitadelStationBot
b01947567a Automatic changelog generation for PR #7993 [ci skip] 2019-02-20 18:19:28 -06:00
deathride58
e2ae4181f4 Merge pull request #7993 from MediHound/dogborg-upgrades-rework-v01 
Cyborg upgrades rework v01
 2019-02-20 19:19:20 -05:00
BlackMajor
1ff058ac50 Whoops 2019-02-20 21:27:31 +13:00
deathride58
b58502ae70 Merge pull request #8006 from Citadel-Station-13/viola_chan 
Adds a modified ckey-locked hairstyle for Fractious
 2019-02-19 08:14:28 -05:00
BlackMajor
10244cd3b1 Plushtide 2 
More plushies, /random plush spawner.
Some more dumb sounds.
 2019-02-20 01:36:38 +13:00
Trilbyspaceclone
66f1a572ea Update packs.dm 2019-02-17 22:00:41 -05:00
Trilbyspaceclone
5ca088202d Update packs.dm 2019-02-17 21:25:40 -05:00
kevinz000
42264cb671 Update admin.dm 2019-02-17 01:55:23 -08:00
BlackMajor
0f65c3405e Merge pull request #3 from Citadel-Station-13/master 
Me update before do thing
 2019-02-17 14:14:05 +13:00
kevinz000
eead9b6eaa viola donator hairstyle 2019-02-15 08:24:31 -08:00
nik707
efce0e144f Merge pull request #7985 from Citadel-Station-13/kevinz000-patch-20 
Doubles say/emote MAX_MESSAGE_LEN
 2019-02-14 20:38:37 -06:00
CitadelStationBot
e37382442f Automatic changelog generation for PR #7997 [ci skip] 2019-02-13 23:02:02 -06:00
deathride58
7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
CitadelStationBot
ae903ce89b Automatic changelog generation for PR #7996 [ci skip] 2019-02-13 23:01:38 -06:00
deathride58
fe198c6717 Knockdowns will now force people to be dismounted from ridden vehicles (#7996) 
* knockdown() now causes people to be dismounted from ridden vehicles

* actually puts it in the right fuckin place
 2019-02-13 21:01:36 -08:00
CitadelStationBot
087ea4c1b4 Automatic changelog generation for PR #7995 [ci skip] 2019-02-13 23:01:14 -06:00
deathride58
40d9dee654 gives combat mode examine text and a message on activation (#7995) 2019-02-13 21:01:12 -08:00
CitadelStationBot
9b510d9454 Automatic changelog generation for PR #7994 [ci skip] 2019-02-13 22:59:53 -06:00
deathride58
2c705a7ba4 QOL for pickpocketing - Stripping items off of someone will now place them in your hands if possible (#7994) 2019-02-13 20:59:51 -08:00
CitadelStationBot
98642bcf25 Automatic changelog generation for PR #7982 [ci skip] 2019-02-13 22:47:59 -06:00
Coolgat3
f7b1304d57 Fixes clockcult to be actually playable on citadel. (#7982) 
* Some fixes

* Buffed vanguard to grant infinite stamina to actually make you immune to stuns

* Fixed the comment to not say infinite stun immunity cause that looked scary and bugged me lmao

* Revert "Buffed vanguard, infinite stam"

This reverts commit 8290e5bc4050f7c6476cde3dafb327bf93d49ef3 and
105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Revert "Buffed vanguard to grant infinite stamina to actually make you immune to stuns"

This reverts commit 105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Fixed vanguard and trying to fix reebe getting the reebe ztrait

* Git is hard. Fix.

* Vanguard buffs

* Git ate the credits
 2019-02-13 20:47:57 -08:00
CitadelStationBot
b3633f59c1 Automatic changelog generation for PR #7981 [ci skip] 2019-02-13 22:47:11 -06:00
Tupinambis
0f271498d1 Makes plushies less common. (#7981) 2019-02-13 20:47:09 -08:00
Trilbyspaceclone
7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974) 
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
 2019-02-13 20:46:55 -08:00
Poojawa
2f2b089db1 Adds realism to pleasure (#7986) 2019-02-13 20:45:16 -08:00
MediHound
f8f482bc69 Changes to Borg upgrades and modules 
Disabler Cooler now works for Security and K9, added Crew Pinpointer to Security and MediHound, added Crew Monitor to Medical.
 2019-02-11 16:51:36 +01:00
CitadelStationBot
e4cc58c413 Automatic changelog generation for PR #7983 [ci skip] 2019-02-08 07:29:06 -06:00
Ghom
d1d22d9d24 > (#7983) 2019-02-08 05:29:04 -08:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938) 
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-02-08 05:26:42 -08:00
Trilbyspaceclone
ba26c374cb [Ready] Janitor buff, they can now get a spray bottle of drying agent (#7960) 
* Update spray.dm

* Update packs.dm

* Update wardrobes.dm

* >Works with cargo and lists all the time yet still forgets the comma

* Update wardrobes.dm

* Update packs.dm
 2019-02-08 05:25:07 -08:00
kevinz000
477d1151da Update say.dm 2019-02-08 05:23:51 -08:00
MediHound
f6c8b654f0 Merge pull request #1 from Citadel-Station-13/master 
Cyborg-Upgrade-Rework-v01
 2019-02-08 12:18:15 +01:00
CitadelStationBot
9be162e01b Automatic changelog generation for PR #7980 [ci skip] 2019-02-08 04:13:16 -06:00
MediHound
737c0c7700 Update ion_storm.dm (#7980) 
* Update ion_storm.dm

* Update ion_storm.dm
 2019-02-08 02:13:14 -08:00
CitadelStationBot
127eadffd5 Automatic changelog generation for PR #7977 [ci skip] 2019-02-08 04:11:05 -06:00
Zargul
4574627250 Low plasma concentration does not damage anymore (#7977) 
* Update lungs.dm

* Update lungs.dm

* Update lungs.dm
 2019-02-08 02:11:02 -08:00
CitadelStationBot
599445cd97 Automatic changelog generation for PR #7973 [ci skip] 2019-02-05 20:15:33 -06:00
deathride58
7b00195c0c reduces stamloss for shotgun pumping from 5 to 2 (#7973) 2019-02-05 18:15:31 -08:00
CitadelStationBot
ba57596789 Automatic changelog generation for PR #7979 [ci skip] 2019-02-05 20:15:14 -06:00
NopemanMcHalt
78dca7552e Adds two crusader variants for chaplain (#7979) 
* More crusader armor variants to pick from

Not modularized.

* Makes armor name generic/same with exception of horned and winged helmets

* goddamn it fucking hell what the shit AAAAAAAA

New crusader armor is now digitigrade compatible, also fixes digitigrade templar armor.
 2019-02-05 18:15:12 -08:00
Trilbyspaceclone
cf4c5bc7e5 Update snacks_other.dm (#7971) 2019-02-05 18:14:23 -08:00
Trilbyspaceclone
32e0d08c1d Adds a ton of new clown names (#7970) 2019-02-05 18:13:54 -08:00
Trilbyspaceclone
660703e713 [Ready] Fixes price of Paperwork and makes the not have 2 spare pens (#7969) 
* Update manifest.dm

* Blacklists

* Removes cardboard

* Forgot the comma

* : /
 2019-02-05 18:13:26 -08:00
Trilbyspaceclone
1eff3dcdb5 [Ready] Gives large compressed matter its own name and desc, Also ports Tg #41256 (#7953) 
* Update RCD.dm

* Ports Tg#41256

* .
 2019-02-05 18:11:18 -08:00
Trilbyspaceclone
7b0f9de138 [Ready] More useful tips. (#7957) 
* Usefull tips

* Update tips.txt

* Update tips.txt

* distance

* Apply suggestions from code review

Rags helpings

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Half way with rag
 2019-02-05 18:10:53 -08:00