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
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
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
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
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
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
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
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
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
f93ca08aa7
Fixes irreparable plating ( #34472 )
2018-01-18 20:13:25 -06:00
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
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
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
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
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
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
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
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
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
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
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
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
f2c5a8ae2a
Spellcheck: Fixed a typo on holy_weapons.dm ( #34561 )
2018-01-18 16:46:13 -06:00
91299a6152
Merge pull request #4838 from deathride58/loadoutsystem
...
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
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
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
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
4f058dbf6c
Merge pull request #4906 from deathride58/mapseparation2
...
Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
2018-01-18 00:03:32 -06:00
9bf498c763
Merge pull request #4903 from Citadel-Station-13/upstream-merge-34291
...
[MIRROR] Removes sulpheric acid requirement from most computer boards
2018-01-18 04:59:08 +00:00
8c743141da
Merge pull request #4721 from deathride58/genitalexamine
...
Exposed genitals will now add details onto examine text
2018-01-18 04:56:50 +00:00
f92f1f0390
Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1
...
Shock collars
2018-01-18 04:56:18 +00:00
9e0f8384e5
ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS
2018-01-17 23:51:54 -05:00
7411b25113
trying to fix the bug that causes gear with apostrophes in their name to be unusable
2018-01-17 18:31:42 -05:00
5fd8606a3f
migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes
2018-01-17 17:19:54 -05:00
62c8371961
Removes sacid requirement
2018-01-17 16:02:57 -06:00
45818d03b3
Merge pull request #4901 from Citadel-Station-13/upstream-merge-33916
...
[MIRROR] [READY] Allows the supermatter's radiation collectors to produce research points in short bursts
2018-01-17 20:15:38 +00:00
cc1babf6c3
Merge pull request #4900 from Citadel-Station-13/upstream-merge-34509
...
[MIRROR] Super Surplus Crate
2018-01-17 20:15:13 +00:00
e8e6b3e770
Merge pull request #4899 from Citadel-Station-13/upstream-merge-34500
...
[MIRROR] fixes a mass recall runtime error that prevented it from working
2018-01-17 20:14:55 +00:00
28aae2cf35
Merge pull request #4896 from Citadel-Station-13/upstream-merge-34507
...
[MIRROR] Add JMP buttons to SDQL select results
2018-01-17 20:13:51 +00:00
656fb45fd2
Merge pull request #4895 from Citadel-Station-13/upstream-merge-34353
...
[MIRROR] Ghosts can start CTF on their own
2018-01-17 20:13:00 +00:00
e14795291d
Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319
...
[MIRROR] Fails travis on common mapping mistakes
2018-01-17 20:12:39 +00:00
c7d3dd7e41
Merge pull request #4888 from Citadel-Station-13/upstream-merge-34322
...
[MIRROR] Removes ash flora being harvested on roundstart
2018-01-17 20:11:36 +00:00
a0319643bd
Merge pull request #4887 from Citadel-Station-13/upstream-merge-34378
...
[MIRROR] Pirates are now skeletons
2018-01-17 20:11:12 +00:00
7b4214b199
Merge pull request #4886 from Citadel-Station-13/upstream-merge-34427
...
[MIRROR] Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow
2018-01-17 20:10:45 +00:00
a0a3232360
[READY] Allows the supermatter's radiation collectors to produce research points in short bursts ( #33916 )
...
* allows radiation collectors present on the station roundstart to generate research points
* fixes bitcoin production rate, fixes multitool not activating multitool_act properly
* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird
* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization
* fixes compiling error, is_station_level
2018-01-17 11:18:21 -06:00
bf7a6e4340
Merge pull request #4885 from Citadel-Station-13/upstream-merge-34464
...
[MIRROR] Removed the dumb iscultist() check in runed metal's attack() proc
2018-01-17 10:06:17 -06:00
59e5a71e78
Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468
...
[MIRROR] Cleans up some redundant stripped_input usage
2018-01-17 09:45:04 -06:00
6bcf918111
Update message.dm
2018-01-17 09:40:34 -06:00
0381765c81
Merge pull request #4883 from Citadel-Station-13/upstream-merge-34473
...
[MIRROR] Nerfs techweb cargo points
2018-01-17 09:39:54 -06:00
ab9fa43088
Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450
...
[MIRROR] Fixes lavaboat buckling
2018-01-17 09:39:39 -06:00
Buggy123