Commit Graph

671 Commits

Author SHA1 Message Date
Fox McCloud
9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
variableundefined
8269bc525e Merge pull request #11941 from farie82/examine-info
Adds tips to certain things + general fixes that for issues I across
2019-08-25 16:53:49 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix
Rigging a crate now costs 15 coils instead of deleting your stack
2019-08-16 00:33:20 +08:00
farie82
00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
Arkatos1
bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined
f6505a6fd5 Merge pull request #11819 from Kyep/medals
Department Medals
2019-08-12 17:52:22 +08:00
farie82
b4ed42155b return 2019-08-07 08:43:32 +02:00
joep van der velden
0ab00bb9ff More refactor + wrong item used fix 2019-07-29 21:18:42 +02:00
joep van der velden
ab94782f56 Fire axe code refactor + tooltip 2019-07-29 21:07:12 +02:00
joep van der velden
b46e970327 Better fix now. Use 15 wires using use() 2019-07-29 00:31:22 +02:00
joep van der velden
2bddeb7fde Borgs can't rig crates anymore with cable coil 2019-07-29 00:08:35 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Kyep
fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Arkatos1
de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1
16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1
d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
2019-04-17 22:46:43 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
2019-04-11 07:27:51 +02:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
variableundefined
58f253ad33 Merge pull request #11156 from farie82/big-wrapper-fix
Wrapping big objects and welding lockers now takes time
2019-04-02 18:34:05 +08:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
joep van der velden
7f8837723f target dun exist and user 2019-03-29 09:05:30 +01:00
joep van der velden
591b6b093f spacing 2019-03-28 23:29:36 +01:00
joep van der velden
b8a414a5c4 Also welding takes time now + usr 2019-03-28 23:26:57 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
d8fce5bcdb don't map things in when you can add them to the code 2019-03-17 23:31:53 -04:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
datlo
4ca61d45de Update vendor items, update map for botany/xenobio 2019-02-04 02:10:40 +00:00
datlo
f06e88d82d Remove base access from golem ID, buff golem KA 2019-02-03 14:35:11 +00:00
datlo
74a3631741 compilin and mostly workin
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
datlo
d140b858ec Adds the oxygen grenade 2019-01-23 21:36:08 +00:00
TDSSS
6eb91f000a Fixed merge conflicts AGAIN. 2019-01-22 01:42:00 +01:00
TDSSS
de20cd08a4 Fixed merge conflict with brig remaps 2019-01-21 13:40:33 +01: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
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
lass9030
2da05a846a exclusion 2019-01-19 14:33:40 +01:00
variableundefined
520494b987 Merge pull request #10657 from Quantum-M/HeadMirror
Medical Head Mirror
2019-01-18 18:06:15 +08:00
variableundefined
6218323c0a Merge pull request #10664 from Nicaragua1/clown-locker
Clown and mime locker acceses
2019-01-18 08:24:14 +08:00