7c7c8c70cb
Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines
2017-06-10 10:16:33 +01:00
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
b419782526
Luxury Bluespace Capsule & More
...
tgstation/tgstation#27881
There is now a second bluespace shelter capsule, which is much more
fancy & expensive. Note, this still does not make them generally available.
Changes Summary:
- Added "Shelter Beta" - It comes with a built in kitchen, toilet, shower, three
course meal, and an artifact™️ ! There are plenty of secrets to
behold..
- Added black carpeting. This can be created by the personal crafting
menu and having any crayon + a carpet with you.
- Added fancy wooden and fancy black wooden tables. These are craftable
by hitting wooden table parts with regular and black carpet,
respectively.
- You can now unanchor, deconstruct and color shower curtains. Use any kind of
crayon to color them, and screwdriver to unanchor them. Once they are
unanchored, you may use wirecutters to change them back into materials-
All of which are used in a new crafting recipe for creating them.
- Display cases moderately refactored.
- Added survival pod windows/windoors for the new luxury pod.
2017-06-07 11:17:44 -07:00
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
31c9519f3e
More GC Define Transitions
2017-05-13 04:24:05 -04:00
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
958618db8a
Merge pull request #6974 from jughu/uristwhereareyou
...
Goodbye old friend
2017-03-29 17:02:35 -04:00
d464e19c43
Update mint.dm
2017-03-29 20:11:17 +02:00
b53a548678
Update machine_processing.dm
2017-03-28 19:36:50 +02:00
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
b589d5613a
Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside.
2017-03-21 17:44:18 -04:00
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
acab5d5170
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
b26d50d9f9
Merge branch 'master' into findnreplace
2017-03-08 10:37:10 +01:00
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
dc6f9f5506
rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands
2017-03-07 20:55:43 +04:00
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05:00
9d9e957df1
Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold
2017-03-05 19:53:20 +01:00
b0ded4b821
Merge branch 'master' into findnreplace
2017-03-05 12:09:52 +00:00
5e1bd050f8
Merge branch 'master' into adminin
2017-03-03 23:23:40 -08:00
f5de924915
use multitool on open panel orm to change dir of input and output
2017-03-02 18:04:10 +04:00
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01:00
389890bb2d
Additional admin interaction additions
2017-02-21 13:26:18 +01:00
56dd8b189e
Proper fix for minebot damage issue
2017-02-15 17:23:57 +01:00
519749cf8d
Fix OP minebots, move them into a separate file
2017-02-15 16:21:04 +01:00
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
c6559c7d9e
Fix to_chat
2017-02-11 05:13:28 +01:00
0790ed5f8d
KA fixes, upgrade typo fix
2017-02-08 02:45:13 +01:00
f1254dc7c7
Paradox bag/wisp fixes
2017-02-08 02:21:40 +01:00
8ac7ea4dee
Soul stone QoL update, paranormal hardsuit fixes
2017-02-08 01:27:00 +01:00
18688e6142
I can uncomment you now
2017-02-06 20:51:08 +01:00
5deafdb4e5
Fix Destroy() return, replace set_dir with setDir
2017-02-06 20:44:12 +01:00
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
8e4439c7f1
Add immortality talisman, add final items
2017-02-06 20:08:52 +01:00
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
051ce5a78c
Merge pull request #6333 from uraniummeltdown/oreboxscanner
...
Use advanced mining scanner on ore box to interact with it
2017-02-06 05:10:35 -05:00
ee3417f19a
Update chance
2017-02-06 01:42:59 +01:00
dbe1284214
Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord
2017-02-06 01:42:32 +01:00
72aec0f9f1
Add shared storage and godeye items, split Lavaland loot files
2017-02-06 01:02:03 +01:00
b17dca7c57
Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command
2017-02-05 20:36:04 +01:00
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
3d831b179b
hit ore box with advanced mining scanner to interact with it
2017-02-05 09:30:01 +04:00
a653732219
Sound fixes
2017-01-27 17:47:56 +01:00
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Sam