shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,778 Commits 5 Branches 0 Tags
2fd45f4eebf7e140aa8c4f4977ffbd704fefdf64
Commit Graph
1686 Commits
Author SHA1 Message Date
LetterJayandGitHub bce4575679 Merge pull request #6795 from Citadel-Station-13/upstream-merge-37911 
[MIRROR] Fix runtimes in mood rejuventation
 2018-05-19 09:13:46 -05:00
Tad Hardestyandletterjay 36d4fe8866 Fix runtimes in mood rejuventation (#37911) 2018-05-19 01:51:21 -05:00
ShizCalevandletterjay 5ddcd7133f Fixes radimmune mobs being killed by radiation (#37875) 2018-05-18 06:15:33 -05:00
deathride58andGitHub 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
deathride58andGitHub 93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839 
[MIRROR] Fixes minor cleanbot runtime.
 2018-05-17 18:09:31 +00:00
deathride58andGitHub b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872 
[MIRROR] Fixes Adminorazine killing ash lizards
 2018-05-17 18:08:16 +00:00
ShizCalevandletterjay e425a8514e Fixes sharp weapons deconverting revs (#37871) 
* Fixes sharp weapons deconverting revs

* enhanced commentary
 2018-05-17 10:28:38 -05:00
ShizCalevandletterjay a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) 
* Fixes Adminorazine killing ash lizards

* this should do it...
 2018-05-17 10:24:59 -05:00
vuonojenmustaturskaandletterjay 7429a7ef6a Merge pull request #37839 from AnturK/rr1 
Fixes minor cleanbot runtime.
 2018-05-16 14:37:03 -05:00
LetterJayandGitHub 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
LetterJayandGitHub f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -05:00
LetterJayandGitHub 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
YPOQandletterjay a7b5415a19 Fixes wumborian fugu dead sprite (#37832) 2018-05-14 18:55:54 -05:00
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJayandGitHub f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
Tad Hardestyandletterjay 0cac640dc8 Make admin heals also max out mood 2018-05-13 13:49:10 -05:00
AnturKandletterjay 1c164ff28f Fixes possession funtime (#37737) 
* Fixes possession funtime

* This should probably be generic backend mob list but i can't think of anything else that would need it.
 2018-05-12 19:26:55 -05:00
Tad Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58andGitHub e0f971ecbb Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457 
[MIRROR] Adds a French beret! HONH HONH HONH!
 2018-05-11 03:41:26 +00:00
deathride58andGitHub b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656 
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
 2018-05-11 03:36:01 +00:00
YPOQandletterjay afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
kevinz000andletterjay 3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
XDTMandletterjay ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Ordonisandletterjay ab81220eda Adds a French beret! HONH HONH HONH! (#37457) 
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
 2018-05-09 16:03:28 -05:00
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Jordan BrownandCitadelStationBot deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
deathride58andGitHub a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516 
[MIRROR] Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-02 01:30:00 +00:00
deathride58andGitHub 8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 
[MIRROR] Makes dizziness work again
 2018-05-02 01:25:46 +00:00
deathride58andGitHub e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
Jordan BrownandCitadelStationBot 453bd38ca5 Merge pull request #37516 from XDTM/LinearBrainDamage 
Changes the trauma formula so constant small ticks don't keep triggering traumas
 2018-05-01 09:56:39 -05:00
AlomgaandCitadelStationBot 90ecbf6bb9 Makes dizziness work again 2018-04-30 13:38:12 -05:00
LetterJayandGitHub 34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 
[MIRROR] Removed /obj/item/asteroid path
 2018-04-30 11:03:16 -05:00
ShizCalevandCitadelStationBot 3160d7771d Removed /obj/item/asteroid path (#37500) 
* Cleans up some item paths

* removed kebab
 2018-04-30 04:57:09 -05:00
MickyanandCitadelStationBot 01e4304326 Makes nutrition level show up on self-inspect (#37509) 
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
 2018-04-30 00:17:59 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000andCitadelStationBot 6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
deathride58andkevinz000 d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498) 
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
 2018-04-27 07:41:31 -07:00
deathride58andGitHub 28dd1a28ab Merge pull request #6528 from Citadel-Station-13/upstream-merge-37439 
[MIRROR] admins can now var edit the sound frogs make when they are stepped on
 2018-04-27 09:41:14 +00:00
deathride58andGitHub f8406d1bfe Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375 
[MIRROR] fixes cqc working outside chef assigned areas
 2018-04-27 09:31:04 +00:00
ArmhulenandCitadelStationBot da1ac395c2 ok! (#37439) 2018-04-27 02:28:13 -05:00
LetterJayandGitHub d679d27766 Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378 
[MIRROR] Fixes brain tumor. Again.
 2018-04-27 00:12:14 -05:00
kevinz000andCitadelStationBot 42d0541a28 fixes cqc working outside chef assigned areas (#37375) 
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
 2018-04-24 10:23:34 -05:00
AnturKandCitadelStationBot 1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa 832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
LetterJayandGitHub de2ab536d1 Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320 
[MIRROR] Fixes pAI's breaking drone static.
 2018-04-22 22:21:45 -05:00
LetterJayandGitHub 7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270 
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
 2018-04-22 22:19:28 -05:00
AnturKandCitadelStationBot e36c44be5c Fixes pAI's breaking drone static. (#37320) 2018-04-22 19:19:43 -05:00
LetterJayandGitHub 8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00