shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,183 Commits 5 Branches 0 Tags
57c829a2aab6dca828af5cdcf703dfd70f3be984
Commit Graph

12183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Buggy123
57c829a2aa Added observer verb View Gases (#34574) 
* Added observer verb View Gases

* Fixed atmospheric report plurality correctness

* Changed mole/s to mol.
 2018-01-19 09:23:22 -06:00
CitadelStationBot
c6f227fc18 cl 2018-01-19 06:47:52 -05:00
CitadelStationBot
75ea6f8ca4 Automatic changelog generation for PR #4913 [ci skip] 2018-01-19 03:37:49 -06:00
LetterJay
9bd6ec96ac Merge pull request #4913 from Citadel-Station-13/upstream-merge-34546 
[MIRROR] Updates travis to build on BYOND 512.1403
 2018-01-19 03:37:47 -06:00
LetterJay
9adbe08df8 Merge pull request #4923 from Vivinet/xeno-fix 
Temp. Xeno-Hybrid Eye Fix + Normal Leg Addition
 2018-01-19 03:21:14 -06:00
LetterJay
caa0d29bc8 Merge pull request #4926 from Citadel-Station-13/upstream-merge-34213 
[MIRROR] [ready] Adds a system to get a stack trace as a list.
 2018-01-19 02:52:29 -06:00
CitadelStationBot
451885dae4 Automatic changelog generation for PR #4925 [ci skip] 2018-01-19 02:52:23 -06:00
LetterJay
379fdb613e Merge pull request #4925 from Citadel-Station-13/upstream-merge-34492 
[MIRROR] Ports Aurora's floor tile color turf decals (For mappers)
 2018-01-19 02:52:21 -06:00
LetterJay
925a83d6f6 Merge pull request #4924 from Citadel-Station-13/upstream-merge-34511 
[MIRROR] Add READMEs to hooks and mapmerge2 directories
 2018-01-19 02:52:05 -06:00
CitadelStationBot
935694af46 Automatic changelog generation for PR #4921 [ci skip] 2018-01-19 02:51:53 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
726604c115 [ready] Adds a system to get a stack trace as a list. 2018-01-18 22:45:39 -06:00
Jordan Brown
9478478ca1 Merge pull request #34213 from MrStonedOne/gibstacktrace 
[ready] Adds a system to get a stack trace as a list.
 2018-01-18 22:45:39 -06:00
CitadelStationBot
74b56deaf6 Ports Aurora's floor tile color turf decals (For mappers) 2018-01-18 21:28:15 -06:00
deathride58
757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492) 
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
 2018-01-18 21:28:14 -06:00
CitadelStationBot
3ed64f7a86 Add READMEs to hooks and mapmerge2 directories 2018-01-18 21:27:04 -06:00
Tad Hardesty
f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00
Vivinet
671a1c12f4 Male chest fix + hand fix 
Made it so that the eastward facing xeno male chest was a mirrored version of the westward male chest, not the female one as it was originally.

Mirrored the westward facing right arm with the eastward facing left arm.
 2018-01-18 19:01:20 -08:00
Vivinet
18fa25cc17 Temp. Xeno Eye Fix - Leg Addition 
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
 2018-01-18 18:20:58 -08:00
CitadelStationBot
0ef3072f26 Fixes irreparable plating, deprecates broken & burnt vars on maps 2018-01-18 20:13:26 -06:00
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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 Brown
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 Brown
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 Brown
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 Brown
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
MoreRobustThanYou
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
0e9f946f3c Updates travis to build on BYOND 512.1403 2018-01-18 16:49:43 -06:00
Jordan Brown
3c03f2ecd5 Merge pull request #34546 from praisenarsie/patch-20 
Updates travis to build on BYOND 512.1403
 2018-01-18 16:49:42 -06:00
CitadelStationBot
1ab860e37c Fixes being able to place abstract items in fridges & chem dispensers 2018-01-18 16:48:32 -06:00