Commit Graph

19055 Commits

Author SHA1 Message Date
Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
datlo e7eef0bf42 Fix bluespace bunny ears fluff desc 2019-01-26 00:53:02 +00:00
variableundefined 05c6ee0107 Merge pull request #10718 from Jazz23/Surgical-Arm-implant-quickie
Small Surgical Arm Menu Change
2019-01-26 07:00:10 +08:00
Gwydion Brain cc05eda75e Merge branch 'master' into CheekyCrenando_Fluff_coat 2019-01-25 13:13:20 -08:00
variableundefined 703482736e Merge pull request #10711 from Aurorablade/PSFluffBunny
Pineapple Salad Fluff Item:Bluespace bunny ears
2019-01-25 09:14:49 +08:00
variableundefined f85ec9cc33 Merge pull request #10712 from blinkdog/minor-path-cleanup
Some path normalization
2019-01-25 07:41:01 +08:00
Jazz23 54d4397474 Easier to access bone setter (nobody uses surgical drill) 2019-01-24 13:29:46 -08:00
variableundefined 3445d46b20 Merge pull request #10689 from AzuleUtama/dampRagLidFix
Stops damp rag having a lid, refactors glass containers to let objects state if they lack a lid
2019-01-24 18:13:22 +08:00
Gwydion Brain b1683380c9 Cheeky's Fluff item
I sold my soul to CM and they won't give it back :(
2019-01-24 01:01:55 -08:00
Aurorablade 2bb4b3ff5a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PSFluffBunny 2019-01-24 01:26:47 -05:00
Dovixx 6741238ef1 Stop the animals! 2019-01-23 22:34:51 +02:00
Patrick Meade b4641b7fdb Some path normalization 2019-01-23 08:54:19 -06:00
variableundefined d0f7ce9868 Merge pull request #10709 from AzuleUtama/uplinkItemFormatting
Traitor Item formatting, description and spelling changes
2019-01-23 19:46:18 +08:00
variableundefined 0888ac6860 Merge pull request #10705 from datlo/sstextramaps
Add SST hardsuit sprite and SIT/SST shuttle to delta
2019-01-23 19:45:09 +08:00
variableundefined 75e357cf37 Merge pull request #10670 from iantine/mouse-fluff
Lumi's fluff mouse and resting mice
2019-01-23 19:44:46 +08:00
Aurorablade fb89274c6d PineappleSaladFluff 2019-01-22 20:26:47 -05:00
Fox McCloud ad6fc45f74 Fixes Null Crafting Recipes 2019-01-22 18:45:54 -05:00
AzuleUtama 898725ee60 Formatting, description and spelling changes 2019-01-22 16:45:13 +00:00
AzuleUtama 0293d2674c the rerefactor 2019-01-22 10:32:44 +00:00
datlo 7354832a0a add hardsuit sprites 2019-01-22 07:54:21 +00:00
Fox McCloud ec0f81ed7c Merge pull request #10679 from Terilia/CakeCat
Cake Cat Cak - How the Chef turned Frankenstein with cake base, sp(r)inkles and frosting
2019-01-21 22:49:20 -05:00
variableundefined 1c16e4c9de Merge pull request #10685 from datlo/SSThardsuitnammo
Updates Syndicate Strike Team gear, ready room, and shuttle
2019-01-22 06:31:09 +08:00
Nicaragua 8175d67b2e honk_bot from V2
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
2019-01-21 12:31:47 -03:00
datlo 6b43fae248 Add dusting implant 2019-01-21 13:24:06 +00:00
datlo 9e508be95f Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into SSThardsuitnammo 2019-01-21 11:16:36 +00:00
AzuleUtama feaa20352b fixes damp rag having a lid 2019-01-20 18:28:07 +00:00
datlo c92c222f63 fix greys not getting translator as RD, CMO, CE 2019-01-20 18:14:00 +00:00
datlo e15e68e32e adds hud 2019-01-20 18:08:53 +00:00
Terilia 419acccc99 Updated the cat. If you reference a variable, you need to define it right, woops! 2019-01-20 16:52:36 +00:00
datlo df6a9a4d8d properly remove bombs 2019-01-20 16:26:31 +00:00
datlo 783824b5e9 Updates SST, room, and shuttle
Changes to SST gear
- Added syndi internals box
- Replaced pressurized oxy tank by nukie jetpack
- Replaced reinforced spacesuit by reinforced elite hardsuit. Armor is
below dsquad armor, however you can turn it to combat mode, making you
much more mobile. Looks the same as the nukie elite hardsuit, for now, I
don't think it's a problem tho.
- Replaced pistol by syndicate revolver, aswell as the extra ammo. SST
can now print extra ammo at hacked autolathes to keep the fight going if
they run out due to this.
- Added a spare mag for the SAW
- Added a military belt (different color to match the hardsuit)
- Removed flashlight and EMP grenade
- Removed all access on SST IDs. They still get access to maintenance
and station exterior airlocks so they don't have to break in to enter
the station. They're still agent IDs, so you got syndi access, can copy
access, customize, etc.
A lot of this gear no longer spawns on the SST at spawn, and is instead
in the new SST lockers.
Admin outfitted SST are spawned with their full gear, which was also
updated.

Map changes
- Added 3 syndicate bombs beacons, a bomb detonator, 2 upgraded health
analyser, a syndi toolbox, 2 multitool to the SST ready room
- Added 6 SST lockers, containing EVA gear and SAW + ammo
- Fixed issues with the blast doors for the SIT and SST shuttles, both
sets of blast doors now open and close together, they can also be opened
from inside and outside the shuttle now. This lets you lock your shuttle
safely from anyone that doesn't have syndicate access, an emag, or can
just bypass the blast doors somehow.
- Added atmospherics blocking fans to the SIT and SST shuttle since they
don't have a cycling airlock and do not usually dock at a designated
docking station. This helps prevent the SIT (who do not start with EVA
gear) spacing themselves by going through the wrong door.
- Added an oxygen cannister and two syndicate sleepers to the SST
shuttle, removed the obsolete toxin bombs spawner (replaced by syndicate
bomb beacons in ready room)
2019-01-20 16:17:51 +00:00
datlo fffe211c8f readd deathgasping to human/borgs 2019-01-20 12:22:09 +00:00
xerdies 830c519ef8 implemented Fox and Ty's requested changes. 2019-01-20 09:38:21 +00:00
variableundefined 15732a7587 Merge pull request #10638 from Kyep/mentorhelp_bwoinks_for_admins
Let admins disable bwoink sound for mentorhelps
2019-01-20 14:24:02 +08:00
Terilia 02db476100 butcher list update.
Looks like I forgot the brain.
2019-01-19 19:22:24 +00:00
Terilia 39d9708bd9 Adjusted the creation, reverted back to CheckParts, adjusted various desc's.
Note that the mind transfer is currently broken.
2019-01-19 19:12:07 +00:00
Terilia 8002d744d9 Adjusting the recipe name one final time. 2019-01-19 18:19:30 +00:00
Terilia 97a5ef3e20 Restoring original recipe and some minor changes. 2019-01-19 18:15:22 +00:00
Terilia 164e0fa7c9 Cak submission && "Sprinkles" fix 2019-01-19 18:05:45 +00:00
FreeStylaLT d0d441b7fa a completely inconspicuous PR 2019-01-18 19:39:24 +09:00
variableundefined 520494b987 Merge pull request #10657 from Quantum-M/HeadMirror
Medical Head Mirror
2019-01-18 18:06:15 +08:00
variableundefined 0b8ce92516 Merge pull request #10652 from AzuleUtama/syndieBundleRework
Syndicate Bundles - Increased overall value and added a new bundle
2019-01-18 18:04:59 +08:00
Lumi c31e5425f9 Mouse fluff and mouse rest
Adds Lumi's mechanical mouse fluff (at this stage, it is admin spawnable only) and gives NPC mice the ability to rest using the proper sprite.
2019-01-18 16:29:59 +11:00
variableundefined 1bb6bd0772 Merge pull request #10660 from datlo/syndiborgfix
Fix syndicate borg spawner spawning saboteur instead of assault
2019-01-18 08:24:00 +08:00
lass9030 abd67b54a5 missing slash 2019-01-17 17:21:09 +01:00
lass9030 26d02c7abb sight update 2019-01-17 16:59:31 +01:00
variableundefined d4d8ccc64a Merge pull request #10484 from Eniraz/jetpack-on-exosuit
Allows jetpacks to work in suit storage slot
2019-01-17 19:03:51 +08:00
B.A.L 876d70678d Sees to concerns and such. 2019-01-16 19:26:21 -07:00
datlo 07a38a3a26 fix borg spawner logic error 2019-01-16 10:22:31 +00:00
B.A.L 982fbaa5b3 Codework
Adds mirror to medical white closet, the mirror itself, and chance for surgeons to spawn with it.
2019-01-15 18:44:32 -07:00