b88dbd301a
Adds useful sec officer tips ( #34423 )
...
* Adds a useful sec officer tip
* ok done
* Update tips.txt
* Update tips.txt
2018-01-18 17:48:49 -05:00
1328cd6cbd
Automatic changelog generation for PR #34558 [ci skip]
2018-01-18 14:48:04 -08:00
eaa46323d7
Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs
...
Log PDA messages sent by the message monitor console
2018-01-18 17:48:01 -05:00
8bde56fd5a
Merge pull request #34553 from ShizCalev/abstract-transfertoloc
...
Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 17:47:48 -05:00
2bc1baed36
Spellcheck: Fixed a typo on holy_weapons.dm ( #34561 )
2018-01-18 17:45:29 -05:00
f693dcf70d
Automatic changelog generation for PR #34541 [ci skip]
2018-01-18 13:06:30 -08:00
27bb0d4f18
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:06:27 -06:00
54e334dd7c
Automatic changelog compile, [ci skip]
2018-01-18 19:28:18 +00:00
418069ca36
Automatic changelog generation for PR #34533 [ci skip]
2018-01-18 04:10:16 -08:00
517f86ba76
Merge pull request #34533 from Buggy123/patch-56
...
Fixes integrity value for non-reinforced plasma window
2018-01-18 10:10:11 -02:00
f43c9469d6
Minor map fixes
2018-01-17 20:47:54 -06:00
735950933a
Log PDA messages sent by the message monitor console
2018-01-17 17:17:14 -08:00
117ef6f2e7
Removes sacid requirement
2018-01-17 16:02:43 -06:00
2cf6cafa78
Fixes being able to place abstract items in fridges
2018-01-17 16:49:49 -05:00
a239c63c20
Automatic changelog compile, [ci skip]
2018-01-17 17:18:33 +00:00
3ba9734406
Automatic changelog generation for PR #33916 [ci skip]
2018-01-17 09:17:28 -08:00
0c282b8865
[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 12:17:25 -05:00
d68cce3f52
Automatic changelog compile, [ci skip]
2018-01-17 17:14:45 +00:00
eb083410c9
Merge pull request #34509 from Iamgoofball/patch-365
...
Super Surplus Crate
2018-01-17 08:27:54 -05:00
b6f599e8a2
Automatic changelog generation for PR #34500 [ci skip]
2018-01-17 05:09:12 -08:00
38e8bdeaeb
Merge pull request #34500 from Xhuis/recallfix
...
fixes a mass recall runtime error that prevented it from working
2018-01-17 08:09:10 -05:00
a877b9022a
adds cameras to runtimestation ( #34506 )
2018-01-17 08:08:26 -05:00
4ff5196a07
Fixes integrity value for reinforced plasma window
2018-01-17 02:56:08 -05:00
553855ec43
Merge pull request #34494 from tgstation/KorPhaeron-patch-1
...
Adds a line about alien species to contributing.md
2018-01-17 19:25:01 +13:00
dc586b7bb5
Automatic changelog generation for PR #34507 [ci skip]
2018-01-16 19:41:27 -08:00
45048cbaf2
Merge pull request #34507 from AutomaticFrenzy/patch/sdql-jmp
...
Add JMP buttons to SDQL select results
2018-01-16 22:41:24 -05:00
cb59503a32
Automatic changelog generation for PR #34353 [ci skip]
2018-01-16 17:21:28 -08:00
19c214514e
Ghosts can start CTF on their own
...
🆑 coiax
add: If enough people vote to start CTF (by clicking on a CTF controller
as a ghost), then CTF will automatically begin.
/🆑
- CTF will no longer restart 30 seconds after it ends, it requires
people to vote for it.
- Victory messages are coloured with the team's colour.
- Current number of people required to start CTF is 4 people.
2018-01-16 19:21:25 -06:00
fa136e71f4
Revert "Merge pull request #33537 from ninjanomnom/priority-defines" ( #34528 )
...
This reverts commit 0244b618865d07df08ea
2018-01-16 20:04:35 -05:00
1b4a3f6e7d
Automatic changelog compile, [ci skip]
2018-01-17 01:03:44 +00:00
d35f3da470
[READY]Circuitry lab ( #34493 )
...
* spelling
* base
* maps
* merge
* firealarm
* floor
* floor again
* if you insist...
* DV
* DV(2)
* DV(3)
* fuck
* fuck
* apc
* boxapc
2018-01-16 17:44:26 -05:00
05860e2cda
Merge pull request #34502 from AutomaticFrenzy/patch/runtime-decal
...
Update Space Station 13 decal on RuntimeStation
2018-01-16 15:46:08 -05:00
0ccf2d8e1a
Automatic changelog generation for PR #34520 [ci skip]
2018-01-16 12:40:18 -08:00
9dcdbff711
Nothing in this commit ( #34520 )
2018-01-16 15:40:15 -05:00
387e09c08f
Merge pull request #34319 from ShizCalev/travis-maps
...
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
073744fb19
Merge pull request #34322 from coiax/no-longer-harvested
...
Removes ash flora being harvested on roundstart
2018-01-17 09:35:23 +13:00
9d0493489b
Automatic changelog generation for PR #34378 [ci skip]
2018-01-16 12:34:09 -08:00
f065ee0098
Merge pull request #34378 from nicbn/yarr
...
Pirates are now skeletons
2018-01-17 09:34:07 +13:00
5bcc8757ad
Automatic changelog generation for PR #34427 [ci skip]
2018-01-16 12:33:22 -08:00
ea5924bca8
Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow ( #34427 )
...
* Portal tweaks, and blocked atmos
* Update servant_blocker.dm
* Update servant_blocker.dm
* Update servant_blocker.dm
2018-01-17 09:33:19 +13:00
7fe928d11a
Merge pull request #34468 from ShizCalev/redundant-trim
...
Cleans up some redundant stripped_input usage
2018-01-17 09:32:00 +13:00
afd92a5b12
Merge pull request #34464 from uraniummeltdown/dumbcult
...
Removed the dumb iscultist() check in runed metal's attack() proc
2018-01-17 09:31:15 +13:00
6ebc926f00
Fixes lavaboat buckling ( #34450 )
...
* Buckle order
* lavaboats
2018-01-17 09:30:14 +13:00
30dfc429dd
Merge pull request #34473 from kevinz000/techwebs_points
...
Nerfs techweb cargo points
2018-01-17 09:29:25 +13:00
c9cd64d9e7
Automatic changelog generation for PR #34457 [ci skip]
2018-01-16 12:28:54 -08:00
6cfede150c
Merge pull request #34457 from AutomaticFrenzy/patch/air-status
...
Combine and fix Show Air Status and Air Status in Location
2018-01-17 09:28:52 +13:00
a19b55564f
Merge pull request #34477 from tgstation/Cyberboss-patch-2
...
Adds component incompatible crash to root level so everything doesn't have to do it itself
2018-01-17 09:28:25 +13:00
e25f34da76
Makes report issue handle null round IDs and server names ( #34124 )
...
* Makes report issue handle null round IDs and server names
* What Leo said
* Add missing bracket
* Parenthesis intensify
2018-01-17 09:28:00 +13:00
31217df709
Merge pull request #34470 from Cyberboss/MoveMotd
...
Moves load_motd to config controller
2018-01-17 09:27:35 +13:00
5adf17bf4a
Merge pull request #34413 from kevinz000/patch-430
...
Allows C4 on mobs again
2018-01-17 09:27:09 +13:00
MoreRobustThanYou