Commit Graph

951 Commits

Author SHA1 Message Date
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
B.A.L
876d70678d Sees to concerns and such. 2019-01-16 19:26:21 -07:00
Nicaragua
7fed4e7fbd Fixed Clown and mime locker acces
- They arent public acces anymore.
-Now only clowns can open / lock their lockers
-Mimes can only open / lock their own lockers
2019-01-16 21:49:26 -03: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
Jazz23
5c6dcd7874 I'm confused 2019-01-14 08:58:22 -08:00
variableundefined
c0ec880688 Merge pull request #10621 from datlo/pinpointer4everyone
Nuke ops spawn with their pinpointer
2019-01-14 21:33:44 +08:00
B.A.L
2bc36aace8 Wig stuff 2019-01-13 16:44:39 -07:00
B.A.L
50bf7b61fe Secure closet addition and creation 2019-01-13 16:43:09 -07:00
Jazz23
f780e172f5 Friggen woopsies
I never knew what . = ..() meant until now...
2019-01-09 14:54:50 -08:00
Jazz23
0fa2b73182 Closet Sprite Update + Code changes
as requested
2019-01-09 13:51:09 -08:00
TDSSS
23670cd117 Added SSUs 2019-01-09 21:09:56 +01:00
datlo
8d75384efa Make nuke ops spawn with their pinpointer 2019-01-09 08:45:37 +00:00
Jazz23
5403e5afef Bluespace Closet Addition
Heckin yes dude
2019-01-08 17:44:18 -08:00
variableundefined
f344450885 Merge pull request #10573 from lass9030/head_huds
Single HUD implant to heads locker
2019-01-06 16:10:48 +08:00
variableundefined
7e5930a2a0 Merge pull request #10527 from Mithrandalf/toycuffs
A new toy for the clown
2019-01-04 20:03:39 +08:00
lass9030
b79e02dd41 Lets not forget mining, eh? 2019-01-01 17:01:50 +01:00
lass9030
b96ce8db76 hudimplant to heads locker 2019-01-01 16:53:52 +01:00
joep van der velden
1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
Mithrandalf
0e9191cdd4 Adds the cuffs to the code and the map 2018-12-27 17:01:40 +00:00
datlo
b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00