Jordan Brown
f4ffde7a09
Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3
2017-06-08 12:54:27 -04:00
Joan Lung
81ae23ace9
Merge pull request #28189 from Xhuis/defib_paddle_fix
...
Fixes #8044 , being able to hold defib paddles while dead, by removing NODROP from them
2017-06-08 11:57:30 -04:00
Joan Lung
0832c97527
Merge pull request #28163 from QualityVan/zerocables
...
Prevents cyborgs from extruding materials
2017-06-07 20:25:05 -04:00
Jordan Brown
5bbbd26739
Merge branch 'master' into goonchatv3
2017-06-07 20:06:46 -04:00
Leo
48649596e2
Merge pull request #28150 from ShizCalev/ce-belt
...
Fixes CE's hand drill changing size
2017-06-07 16:14:08 -03:00
Xhuis
60073e279e
Removes NODROP from defibrillator paddles
2017-06-07 12:01:06 -04:00
Leo
4f3d720c93
Merge pull request #28124 from Shadowlight213/whywasthisevenadded
...
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-07 11:07:13 -03:00
Expletive
8413960d8e
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) ( #28115 )
2017-06-06 22:26:56 -03:00
QualityVan
8c33045cd9
Prevents cyborgs from extruding materials
2017-06-06 20:02:24 -04:00
swindly
b976845de3
Weaponizes station charters ( #28111 )
2017-06-06 20:40:01 -03:00
shizcalev
eb3756b8eb
fixed
...
fixes #28120
fixes #28136
2017-06-06 15:36:25 -04:00
Jordan Brown
ccfaf07a5a
Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation ; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3
2017-06-06 09:18:44 -04:00
Leo
c1749f4fa4
Merge pull request #28091 from Expletive/fix28082
...
Fixes #28082 : Private Security cutouts have icons.
2017-06-06 09:12:26 -03:00
Shadowlight213
0150de51c3
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-05 20:58:12 -07:00
thefastfoodguy
2bdd2342a6
Flashlight suduko ( #28053 )
2017-06-05 18:27:44 -03:00
Joan Lung
5884071627
Renames Clockwork Proselytizers to Replica Fabricators ( #28062 )
2017-06-05 14:52:31 -03:00
Expletive
506a351f16
Fix #28082
2017-06-05 01:46:36 -07:00
InsaneHyena
5713a44048
Removes donut steelpoint ( #28041 )
2017-06-05 00:12:26 -03:00
Joan Lung
d5e608807f
Only human and silicon servants can help recite multi-invoker scriptures ( #28049 )
2017-06-04 21:22:55 -03:00
oranges
ca6f4cfc35
refactor another spawn cooldown ( #28022 )
2017-06-04 12:29:41 +02:00
oranges
9e28fd8ae7
Another spawn timer ( #28018 )
2017-06-04 12:23:10 +02:00
Leo
477bd09609
Merge pull request #27948 from swindly/grenade_buff
...
Buffs chemical grenades
2017-06-03 23:38:51 -03:00
Cheridan
aad23d5304
Merge pull request #27964 from Expletive/variablestacksize
...
[READY] Stacks will change item_states and w_class based on how full they are.
2017-06-03 19:02:57 -05:00
Expletive
73d65ceb82
The Crafting Menu now has subcategories! ( #27863 )
...
* subcategories also it's broken
* It works!
* Fix pneumatic cannon recipe
* Some fixes and changes
* Reformats ui, removes redundant chat messages
* Remove comment
* while im at it
2017-06-03 19:28:14 +02:00
Expletive
3f62253b3b
Adds sprites for certain lavaland stacks and adjusts their max_amounts
2017-06-02 07:39:08 -07:00
oranges
0979a24e07
Merge pull request #27932 from octareenroon91/patch-48
...
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 23:41:28 +12:00
Expletive
cc8fea0905
remove-true
2017-06-02 03:15:17 -07:00
Expletive
b928177ea5
Stacks will change sprites and w_class based on how full they are.
2017-06-02 02:55:41 -07:00
Leo
c84b6f2a9b
Merge pull request #27922 from QualityVan/tacticoolwebbing
...
Makes op belts less brown
2017-06-01 22:31:24 -03:00
Steelpoint
901d762d1e
Marine ID Access Change ( #27907 )
2017-06-01 17:29:13 -03:00
swindly
c8b8eec88b
buffs chem grenades
2017-06-01 15:28:21 -04:00
Goodstuff
c8717940a2
Fixes black carpet recipe and sprite ( #27891 )
2017-06-01 10:38:24 -03:00
octareenroon91
4012ce0aa7
Update storage.dm
2017-06-01 00:24:26 -05:00
QualityVan
aff5e45e55
Makes op belts less brown
2017-05-31 20:40:15 -04:00
Expletive
2b298bb6aa
Adds The NT-75 Electromagnetic Power Inducer ( #27653 )
2017-05-31 14:59:13 -03:00
Leo
69f6cc7f96
Merge pull request #27866 from AnturK/something-i-remembered
...
Makes VV'ing ID cards easier.
2017-05-31 10:48:43 -03:00
Joan Lung
5ef4f1581a
Merge pull request #27881 from Expletive/luxurycapsule
...
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 18:05:31 -04:00
Expletive
9466b6f62c
Maybe this time I won't fuck it all up
2017-05-30 14:10:54 -07:00
AnturK
79af94382a
Flamethrower fixes ( #27846 )
2017-05-30 13:54:56 -06:00
AnturK
ae710055cc
Makes VV'ing ID cards easier.
2017-05-30 13:21:34 +02:00
Leo
23d2e3732e
Fixes pAI letting you return to lobby ( #27812 )
2017-05-29 21:42:38 +02:00
Tacolizard
334997133d
Update tank_types.dm ( #27769 )
2017-05-29 10:07:08 -06:00
AnturK
19192fd4ca
Removes dragoontomb ruin and loot. ( #27799 )
2017-05-29 10:04:29 -06:00
Joan Lung
ac4da32733
Splits mining_mobs.dm into separate files ( #27773 )
...
* Splits mining_mobs.dm into separate files
* find/replace
2017-05-29 02:16:26 -04:00
Steelpoint
ac8dddb00f
[Centcom] Nanotrasen Private Security 2.0 ( #27652 )
...
This PR adds a lot of changes so I'll list them one by one, this is a continuation of my original NPS PR, however with criticism taken on: #24161
Centcom Nanotrasen Security. The centcom docks now have two NT private security officers, though they don't seem very lifelike (AKA: Cardboard cutout).
New NT Private Sec cardboard cutout, can be acquired in game as you do with every other cardboard cutout.
New passive, retaliate, NT Private Security NPCs. These NPCs are akin to their aggressive versions, however these officers will only attack someone who attacks them first. If attacked they will call for backup and engage the perpetrator with extreme prejudice.
They are also apart of the 'nanotrasanprivate' faction, meaning they will not attack each other, their aggressive counterparts or player controlled Human Private Sec.
Currently none spawn on any map.
New cyropod Private Security Officer pods. These function akin to lavaland roles in that you click the sleeper and you become that role. The Cyro PSO is currently admin only, but spawns as apart of the same faction as the NPCs. They have all access to centcom
2017-05-29 09:38:26 +12:00
Jordan Brown
1abfc03f88
Merge branch 'master' into goonchatv3
2017-05-28 16:30:33 -04:00
Steelpoint
03b31490dd
[Lavaland Ruin] Crashed Marine Transport ( #27660 )
...
* InitialCommit
* MergeConflict
* Mistakesweremade
* MissingText
* MoreFixesAndBlackList
* Tweaks
* FixedIssues
* FinalFixHopefully
* NewWalls
* IDCardAndNoNTReferences
* LorePassOver
* ArmourNerf
* MergeConflicts
* MergeConflict
* MergeConflict
* SlightRework
* Terran
* IronHawk
2017-05-28 10:30:17 -04:00
AnturK
26be9d20e7
Fixes captain's spare access. ( #27788 )
2017-05-28 10:10:40 -04:00
Leo
460146d4ac
Merge pull request #27748 from kevinz000/patch-187
...
Fixes projectile dampening fields being on infinite cooldown
2017-05-28 10:42:22 -03:00
Joan Lung
9275ec2327
Merge pull request #27750 from kevinz000/patch-189
...
Fixes clown creampie cannon not recharging properly
2017-05-28 09:17:08 -04:00
