Commit Graph

951 Commits

Author SHA1 Message Date
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
Kyep
5f2ef09a13 fixes merge conflict with bureaucracy.dmi 2018-03-01 19:12:10 -08:00
Birdtalon
3787190fb4 changes for loop 2018-02-27 14:29:37 +00:00
Birdtalon
dd3c11a757 for loop 2018-02-23 22:28:29 +00:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
uraniummeltdown
369c654c70 moves material defines to construction.dm
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
shazbot194
e6cbce1eaa Makes it just the mini 2018-01-28 19:07:49 -09:00
shazbot194
980d452f1c Adds in the energy pistol 2018-01-27 14:33:28 -09:00
FalseIncarnate
96c615132a Adds departmental and head of staff mugs
Adds mugs for each department to the loadout.
- The service mug is available to all jobs

Adds mugs for heads of staff, found in their respective locker.
- CE, RD, CMO, HoS, HoP, Captain

Moved mugs to their own loadout category
2018-01-25 01:52:04 -05:00
Kyep
90bb294eea armory hardening, atmos trap, syndi sheets
- Changed west lvl2 door airlock to always be an airlock, so bot is more
likely to path through depot on red.
- Repositioned some syndie mobs so they won't spawn next to breakables.
- Added toxin tank and 2 possible falsewalls next to bathroom, to make
the plasma door trap significantly more dangerous.
- Moved one of the lockers in the comms console room so it cannot block
the other if both spawn.
- Moved turret in dorm room so it cannot end up shooting the lockers.
- Adds south-facing door to armory.
- Adds grenade launcher turret in armory.
- Adds passive vents connecting officer rooms in a cross pattern, such
that using explosives in officer rooms can result in the death of
multiple officers due to air loss.
- Made vault (armory) harder to break into. It now uses high security
airlocks. In addition, on peaceful mode, these are bolted.
- Reduced the self destruct countdown when robbing the depot on peaceful
mode. Still possible, but very risky.
- Fixed issue where admin deactivation of peaceful mode was reported in
logs as a robbery.
- Fixed syndi mobs yelling 'Intruder!' during delta.
- Tweaked bedrooms, beds now have syndi bedsheets and there's a separate
mini-bedroom for an officer.
- Tweaked comms room, now has better layout.
2018-01-08 18:19:00 -08:00
Kyep
83192c3678 peaceful mode, loot rework, hand tele respect areas, AI 2018-01-07 01:12:12 -08:00
Kyep
623da07147 cleanup, syndipod 2018-01-05 03:46:55 -08:00
Kyep
20e2fc2db1 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-01-05 03:25:18 -08:00
Kyep
6783158849 merge, closests, wipe old depot 2018-01-04 14:39:42 -08:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
uraniummeltdown
1c9b3ed159 removes useless alter_health() unused proc 2018-01-02 20:49:28 +05:00
Tayyyyyyy
9ae483758a Add to medivends and remove from brig phys 2017-12-12 01:08:16 -06:00
Tayyyyyyy
5d8b45f20e Stay in medbay, CMO 2017-12-07 10:37:44 -06:00
Tayyyyyyy
791ff1a5d3 Give crew pinpointer to blueshield 2017-12-06 23:37:01 -06:00
Tayyyyyyy
8f0bb38284 Put crew pinpointer in brig phys, CMO, and paramedic lockers 2017-12-03 20:17:28 -06:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
tigercat2000
13edd0a91d Merge pull request #8288 from FreeStylaLT/paramedics_anti_theft_movement
Moves Paramedic's key from his clothes-locker to his EVA locker, removes an extraneous helmet from Paramedic's EVA locker
2017-10-26 15:32:53 -07:00
FreeStylaLT
9bb03159f0 removes the extraneous helmet 2017-10-25 14:29:32 +09:00
Crazy Lemon
f0607410f9 Merge pull request #7268 from Allfd/syndiboots
Give nukeops magboots
2017-10-22 10:22:16 -07:00
FreeStylaLT
a9b4170a11 moves the key 2017-10-21 14:22:41 +09:00
TullyBurnalot
bb3415187a Identation Feex 2017-10-11 22:27:47 +01:00
TullyBurnalot
90fc6b4de2 Garbage Cans inherit full properties from crates 2017-10-10 16:30:08 +01:00
TullyBurnalot
39be6a372d Removed needless "\the"s 2017-10-02 15:28:27 +01:00
TullyBurnalot
e7c5148e57 Garbage Cans are now functional 2017-10-01 23:16:38 +01:00
Jovaniph
c428edf39e Merge Conflict thingy 2017-09-29 19:09:01 -04:00
uraniummeltdown
bbe4c341f8 Merge branch 'master' into biodegrade
# Conflicts:
#	paradise.dme
2017-09-28 13:35:30 +04:00
Birdtalon
9008505997 crates will now forcemove mobs inside when opened 2017-09-27 15:36:47 +01:00
uraniummeltdown
caa41d5640 add changeling biodegrade power, move closet/crate/locker broken and locked vars up, re-add hivemind link to the dme 2017-09-23 19:04:22 +04:00
Jovaniph
cd7b49f770 remove comments 2017-09-20 00:14:50 -04:00
Jovaniph
119d87e56f Removed Sprite / Change locker to wardrobe / Put Dropper and Forma on Table. 2017-09-16 16:44:34 -04:00
Jovaniph
f6fff8f33f Refactor the lockers to make maintainers happy? 2017-09-16 10:47:00 -04:00
Jovaniph
fdfb1c9570 Coroner Locker 2017-09-15 20:32:54 -04:00
Birdtalon
512c9fa5a2 robotics layout change 2017-09-13 20:16:46 +01:00
Birdtalon
d78c1a3fb9 wall-locker bugfix 2017-08-29 15:46:44 +01:00
tigercat2000
c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Fox McCloud
71cfaa2325 Merge pull request #7983 from Birdtalon/wall-lockers
Control click to open wall lockers.
2017-08-28 18:24:08 -04:00
Birdtalon
d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
tigercat2000
d90229e2ad Merge pull request #7839 from taukausanake/buffs_duffs
Buffs duffs
2017-08-14 10:57:06 -07:00
Birdtalon
7aa7634d4a fixes crates 2017-08-14 18:05:04 +01:00
Birdtalon
d22f02af01 shortcut to open wall lockers 2017-08-14 10:32:15 +01:00
taukausanake
3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00
Fox McCloud
2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Sam
6e995515ff whoops 2017-08-04 06:20:58 +01:00
Aurorablade
04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00