Fox McCloud
7626942fce
Merge pull request #7724 from shazbot194/Honk
...
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Fox McCloud
23ee7f02d5
Merge pull request #7567 from SamHPurp/re-factors-posters
...
Refactors posters
2017-07-10 18:48:21 -04:00
tigercat2000
a4159745ef
Merge pull request #7694 from Fox-McCloud/instruments
...
Instruments Refactor and Electric Guitars
2017-07-10 13:24:52 -07:00
shazbot194
c9c3cf3527
Adds in the Jolly Jug
...
Due to my master exploding, I had to remake a couple of my PRs. This
pull adds in the Jolly Jug, the clown version of nothing. The clown
spawns with it and has a backup in their locker, just like the mime, in
addition it spawns with 100u of banana juice.
2017-07-05 17:36:30 -08:00
Fox-McCloud
0b8e61e2cc
Instruments Refactor and Electric Guitars
2017-07-02 03:52:42 -04:00
Fox-McCloud
05a24da2e8
The Most Non-Edgey PR Ever
2017-07-01 19:48:43 -04:00
Crazylemon64
72841c9e70
Refactors TK to work a bit more consistently
...
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07:00
Sam
0f006dbbb4
Refactors posters
2017-06-17 02:08:13 +01:00
Sam
d0dde4f3d7
Uses more QDEL_NULLs
2017-06-15 00:49:00 +01:00
Sam
7c7c8c70cb
Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines
2017-06-10 10:16:33 +01:00
Sam
4d57fff5c9
Updates Intents
2017-06-10 09:43:36 +01:00
tigercat2000
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
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
Fox-McCloud
31c9519f3e
More GC Define Transitions
2017-05-13 04:24:05 -04:00
Markolie
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
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
Mark van Alphen
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
Fox McCloud
958618db8a
Merge pull request #6974 from jughu/uristwhereareyou
...
Goodbye old friend
2017-03-29 17:02:35 -04:00
jughu
d464e19c43
Update mint.dm
2017-03-29 20:11:17 +02:00
jughu
b53a548678
Update machine_processing.dm
2017-03-28 19:36:50 +02:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
KasparoVy
b589d5613a
Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside.
2017-03-21 17:44:18 -04:00
Mark van Alphen
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
Markolie
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
Mark van Alphen
b26d50d9f9
Merge branch 'master' into findnreplace
2017-03-08 10:37:10 +01:00
Fox McCloud
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
uraniummeltdown
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
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Fox-McCloud
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05:00
Markolie
9d9e957df1
Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold
2017-03-05 19:53:20 +01:00
Mark van Alphen
b0ded4b821
Merge branch 'master' into findnreplace
2017-03-05 12:09:52 +00:00
Crazy Lemon
5e1bd050f8
Merge branch 'master' into adminin
2017-03-03 23:23:40 -08:00
uraniummeltdown
f5de924915
use multitool on open panel orm to change dir of input and output
2017-03-02 18:04:10 +04:00
Markolie
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01:00
Markolie
389890bb2d
Additional admin interaction additions
2017-02-21 13:26:18 +01:00
Markolie
56dd8b189e
Proper fix for minebot damage issue
2017-02-15 17:23:57 +01:00
Markolie
519749cf8d
Fix OP minebots, move them into a separate file
2017-02-15 16:21:04 +01:00
uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
Markolie
c6559c7d9e
Fix to_chat
2017-02-11 05:13:28 +01:00
Markolie
0790ed5f8d
KA fixes, upgrade typo fix
2017-02-08 02:45:13 +01:00
Markolie
f1254dc7c7
Paradox bag/wisp fixes
2017-02-08 02:21:40 +01:00
Markolie
8ac7ea4dee
Soul stone QoL update, paranormal hardsuit fixes
2017-02-08 01:27:00 +01:00
Markolie
18688e6142
I can uncomment you now
2017-02-06 20:51:08 +01:00
Markolie
5deafdb4e5
Fix Destroy() return, replace set_dir with setDir
2017-02-06 20:44:12 +01:00
Markolie
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
Markolie
8e4439c7f1
Add immortality talisman, add final items
2017-02-06 20:08:52 +01:00
Markolie
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
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
Fox McCloud
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
