Commit Graph

65 Commits

Author SHA1 Message Date
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02: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
Spartan6
3f6e927a43 Adds classic baton and a cargo cap to Sol Traders 2019-01-20 17:14:01 +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
Kyep
e06b8f39cc adds hand labeller to trader default items 2019-01-10 14:42:36 -08:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
datlo
61c0f71cce Replaces uplink management by automated sharing
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
datlo
19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
Kyep
39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00
Kyep
018519044f deletes unathi breacher 2018-11-18 16:56:29 -08:00
Kyep
1c8542414d ancient vampire raise vampires/shapeshift 2018-11-18 16:54:26 -08:00
Kyep
b7c613f76c gives NTUO centcom access, fixes typo in access.dm, adds mindshield to specops arm implant 2018-11-17 17:28:31 -08:00
Kyep
ec5503a2d5 no more soup 2018-11-16 09:59:04 -08:00
Kyep
d0a64445eb soup flasks 2018-11-16 09:34:57 -08:00
Kyep
2063795224 revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox 2018-11-16 08:47:45 -08:00
Kyep
07f5e956ac musician, ancient one, refactoring 2018-11-08 22:36:05 -08:00
Kyep
1e38720413 WIP 2018-11-03 15:11:54 -07:00
Kyep
c9f9aaa8ea item changes 2018-10-24 16:03:29 -07:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Birdtalon
f36b0a4bff changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list
numerous bugfixes
adds new suit sprites
2018-10-07 22:32:44 +01:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Kyep
fa89130c5c fixes naked outfit 2018-07-06 06:32:28 -07:00
tigercat2000
662d7f34e2 Merge pull request #8949 from Kyep/tsf_marines
Solar Federation Outfit Fixes/Tweaks
2018-05-04 12:50:38 -07:00
Kyep
9f556d4ce6 pistols 2018-04-29 02:25:56 -07:00
Kyep
da2122626a TSF marine update 2018-04-29 01:45:13 -07:00
Kyep
e5ab0981f1 Small syndi officer fix 2018-04-29 00:04:12 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep
c1bf2382b8 squash 2018-04-08 08:05:31 -07:00
Kyep
2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07:00
Kyep
ca8bb33a58 Tiger requests 2018-04-07 14:01:48 -07:00
Kyep
99c3c38b19 deletes ancient vampire, due to an icon bug, may re-add in another pr later 2018-04-01 22:14:01 -07:00
Kyep
2e33456c20 fixes wiz boots, adds ancient vamp, archwiz, nt undercover ops 2018-03-31 19:01:21 -07:00
Kyep
275c2ffc3c syndi officers get red beret, lighter, cigar 2018-03-27 17:08:42 -07:00
Kyep
e014f02324 Improves admin outfits, fixes magboots being missing 2018-03-26 15:44:17 -07:00
Kyep
f13b15806a Refactor
- Deletes Paranormal & Janitor ERT outfits from /datum/outfit/admin (so
they won't show up in the main special outfit list as *static* outfits)
- Adds Paranormal & Janitor ERT outfits to 'emergency response team
member' sub-section of admin dress command, which means they're still
available, but now you can choose the level of them to equip to someone
(amber/red/gamma), instead of them always being the old static outfit
which doesn't match what real ERT actually use anymore.
- Refactors the way that spawning ERT cyborgs works, so that most of
their special stuff is done in New() instead of in response_team.dm.
This means that manually spawning an ERT cyborg will actually work,
rather than generating a half-ert cyborg with much of its special stuff
missing.
- Adds a new subtype of ERT cyborg, /mob/living/silicon/robot/ert/gamma,
which is absolutely identical to the normal ert borg, except that it
always has gamma module unlocked.  This enables admins to manually spawn
ERT gamma borgs, instead of all ERT borgs spawned always being non-gamma
ERT borgs.
2018-01-07 19:14:24 -08:00
tigercat2000
6d467aa9f1 Merge pull request #8289 from Kyep/freedom_operatives
Adds Freedom Operatives
2017-10-26 15:38:45 -07:00
Kyep
a0b7b1eb85 Revokes all-access from Space Soviets 2017-10-21 04:15:25 -07:00
Kyep
26965d34b2 Adds Freedom Operatives 2017-10-21 04:10:53 -07:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Kyep
de56e4bf59 Removed is_hunter_outfit 2017-07-19 02:03:21 -07:00
Fox McCloud
7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00