shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,163 Commits 5 Branches 0 Tags
cd178d97561ed15d3bf2ac87256b10eb4ef89dc0
Commit Graph
12163 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub cd178d9756 Merge pull request #4921 from Citadel-Station-13/upstream-merge-34472 
[MIRROR] Fixes irreparable plating, deprecates broken & burnt vars on maps
 2018-01-19 02:51:51 -06:00
CitadelStationBot 49e0a4e3a8 Automatic changelog generation for PR #4909 [ci skip] 2018-01-19 02:49:15 -06:00
LetterJayandGitHub 6981bcfab2 Merge pull request #4909 from Citadel-Station-13/upstream-merge-34541 
[MIRROR] Adds a Recipe for morphine to medicine
 2018-01-19 02:49:12 -06:00
LetterJayandGitHub a9a9587061 Merge pull request #4897 from Citadel-Station-13/upstream-merge-34494 
[MIRROR] Adds a line about alien species to contributing.md
 2018-01-19 02:48:21 -06:00
CitadelStationBot 0ef3072f26 Fixes irreparable plating, deprecates broken & burnt vars on maps 2018-01-18 20:13:26 -06:00
ShizCalevandCitadelStationBot f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58andGitHub c545dc2f79 Merge pull request #4919 from Citadel-Station-13/upstream-merge-34563 
[MIRROR] Regens icons on clean_act if item is loc'd on a mob
 2018-01-19 00:33:07 +00:00
CitadelStationBot 06ec7faa40 Automatic changelog generation for PR #4918 [ci skip] 2018-01-18 18:32:52 -06:00
deathride58andGitHub d54dae8ddf Merge pull request #4918 from Citadel-Station-13/upstream-merge-34552 
[MIRROR] All crew can purify the Blood Bastard Sword (again)
 2018-01-19 00:32:50 +00:00
deathride58andGitHub ca9ce2058e Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529 
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
 2018-01-19 00:32:26 +00:00
CitadelStationBot 66c9281b17 Automatic changelog generation for PR #4915 [ci skip] 2018-01-18 18:32:13 -06:00
deathride58andGitHub 61ccb255c4 Merge pull request #4915 from Citadel-Station-13/upstream-merge-34438 
[MIRROR] Mass hallucinations now gives the same hallucination to everyone
 2018-01-19 00:32:11 +00:00
CitadelStationBot 99f5f05006 Automatic changelog generation for PR #4914 [ci skip] 2018-01-18 18:31:45 -06:00
deathride58andGitHub b0f8c35379 Merge pull request #4914 from Citadel-Station-13/upstream-merge-34423 
[MIRROR] Adds useful sec officer tips
 2018-01-19 00:31:43 +00:00
deathride58andGitHub 6f312b9d5c Merge pull request #4912 from Citadel-Station-13/upstream-merge-34553 
[MIRROR] Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 23:06:41 +00:00
CitadelStationBot 9e8a3c60fb Automatic changelog generation for PR #4911 [ci skip] 2018-01-18 17:06:21 -06:00
deathride58andGitHub 553ccd5597 Merge pull request #4911 from Citadel-Station-13/upstream-merge-34558 
[MIRROR] Log PDA messages sent by the message monitor console
 2018-01-18 23:06:19 +00:00
deathride58andGitHub b93df3a5b3 Merge pull request #4910 from Citadel-Station-13/upstream-merge-34561 
[MIRROR] Spellcheck: Fixed a typo on holy_weapons.dm
 2018-01-18 23:05:52 +00:00
deathride58andGitHub a1aa60188c Merge pull request #4907 from Vivinet/Potat-OS 
Craftable Intellicard Alt: Potat-OS
 2018-01-18 23:05:21 +00:00
CitadelStationBot 637e5cefdf Regens icons on clean_act if item is loc'd on a mob 2018-01-18 17:00:50 -06:00
Jordan BrownandCitadelStationBot ed9428e29b Merge pull request #34563 from ShizCalev/clean-icon 
Regens icons on clean_act if item is loc'd on a mob
 2018-01-18 17:00:49 -06:00
CitadelStationBot d772cbbffd All crew can purify the Blood Bastard Sword (again) 2018-01-18 16:59:39 -06:00
Jordan BrownandCitadelStationBot 66bc684184 Merge pull request #34552 from Robustin/revert3 
All crew can purify the Blood Bastard Sword (again)
 2018-01-18 16:59:39 -06:00
CitadelStationBot a2d7f2064d changes the null rod's description to reflect its use against clockwork cults 2018-01-18 16:56:26 -06:00
Jordan BrownandCitadelStationBot a38dc60466 Merge pull request #34529 from Xhuis/nullroddesc 
changes the null rod's description to reflect its use against clockwork cults
 2018-01-18 16:56:26 -06:00
CitadelStationBot 2aa33cf3f4 Mass hallucinations now gives the same hallucination to everyone 2018-01-18 16:52:03 -06:00
Jordan BrownandCitadelStationBot 05d87d54a3 Merge pull request #34438 from XDTM/EqualHallucinations 
Mass hallucinations now gives the same hallucination to everyone
 2018-01-18 16:52:03 -06:00
CitadelStationBot 90372e2099 Adds useful sec officer tips 2018-01-18 16:49:50 -06:00
MoreRobustThanYouandCitadelStationBot 5b5822c316 Adds useful sec officer tips (#34423) 
* Adds a useful sec officer tip

* ok done

* Update tips.txt

* Update tips.txt
 2018-01-18 16:49:50 -06:00
CitadelStationBot 1ab860e37c Fixes being able to place abstract items in fridges & chem dispensers 2018-01-18 16:48:32 -06:00
Jordan BrownandCitadelStationBot 594e8c8e6d Merge pull request #34553 from ShizCalev/abstract-transfertoloc 
Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 16:48:32 -06:00
CitadelStationBot 9b97d80366 Log PDA messages sent by the message monitor console 2018-01-18 16:48:25 -06:00
Jordan BrownandCitadelStationBot 08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
CitadelStationBot abf6e1d9fa Spellcheck: Fixed a typo on holy_weapons.dm 2018-01-18 16:46:14 -06:00
ThePainkillerandCitadelStationBot f2c5a8ae2a Spellcheck: Fixed a typo on holy_weapons.dm (#34561) 2018-01-18 16:46:13 -06:00
CitadelStationBot 8d19f35d33 Automatic changelog generation for PR #4838 [ci skip] 2018-01-18 15:32:03 -06:00
LetterJayandGitHub 91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
CitadelStationBot 8cf5770ae0 Automatic changelog generation for PR #4908 [ci skip] 2018-01-18 15:26:11 -06:00
LetterJayandGitHub a4282dd904 Merge pull request #4908 from Citadel-Station-13/upstream-merge-34533 
[MIRROR] Fixes integrity value for non-reinforced plasma window
 2018-01-18 15:26:07 -06:00
CitadelStationBot 7b3a5e1f33 Adds a Recipe for morphine to medicine 2018-01-18 15:07:13 -06:00
OrdonisandCitadelStationBot c2f8339135 Adds a Recipe for morphine to medicine (#34541) 
* Adds a Recipe for morphine to medicine

Exactly what it says on the tin.

* Ketrazine

Adds ketrazine, a combat stimulant with severe consequences for use.

* Revert "Ketrazine"

This reverts commit d618fe337cc28f5513c59ff3399894c10dde4a7d.
 2018-01-18 15:07:13 -06:00
Vivinet b3899f0136 DME addition 2018-01-18 11:27:28 -08:00
CitadelStationBot 15e7d28033 Fixes integrity value for non-reinforced plasma window 2018-01-18 06:11:01 -06:00
LeoandCitadelStationBot 0d6d7116ff Merge pull request #34533 from Buggy123/patch-56 
Fixes integrity value for non-reinforced plasma window
 2018-01-18 06:11:01 -06:00
CitadelStationBot d2cbcae629 Automatic changelog generation for PR #4097 [ci skip] 2018-01-18 00:28:06 -06:00
deathride58andGitHub 3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains 
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
 2018-01-18 06:28:04 +00:00
CitadelStationBot 0733768437 Automatic changelog generation for PR #4906 [ci skip] 2018-01-18 00:03:37 -06:00
LetterJayandGitHub 4f058dbf6c Merge pull request #4906 from deathride58/mapseparation2 
Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
 2018-01-18 00:03:32 -06:00
Vivinet 1cf142a7e4 Craftable Intellicard Sprite: Potat-OS 
- Adds the Potat-OS, a Portal inspired way to card AI's! Functionally identical to the intellicard, now with a %100 more starch.

- Crafted using a cable coil, a metal rod, an intellicard and a potato and found in the robot crafting menu.
 2018-01-17 21:28:06 -08:00
deathride58andGitHub e22b022e98 Merge pull request #4902 from Vivinet/Vivinet 
Mining Droid + Borg Tank Tread Movement
 2018-01-18 04:59:24 +00:00