Commit Graph

536 Commits

Author SHA1 Message Date
ZomgPonies
e9b413b1ff Moved broken/deanchored window logging from adminlog to attacklog 2015-02-12 02:16:55 -05:00
Fox-McCloud
dbd2063561 Merge pull request #286 from FalseIncarnate/master
[Feature] Food Carts
2015-02-11 16:53:55 -05:00
FalseIncarnate
72273b8f56 Food Cart Re-Sprite and Adjustments
Swaps food cart sprite to use TG's food cart.
- Old sprite is present in code for possible future use.

Adds ability to wrench carts into place to prevent them from being
moved.

Food cart code adjusted to use lists instead of separate variables for
each slot.
- Slot variables have been commented out but left in code in case we
want to switch back for some reason.

Minor rearrangement of Janicart attackby checks to avoid potential
issues with trying to use wrenches or crowbars on the cart while a trash
bag is present.
2015-02-10 23:32:59 -05:00
Markolie
64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
FalseIncarnate
dd54bf52a4 [Feature] Food Carts
Adds brand new Food Carts!
- Can carry 6 food items and 6 drink items
- One spawns in the kitchen, additional ones may be ordered from cargo
for 10 supply points each
- Thanks to Tigercat2000 for the base sprite image

Removes the OPENCONTAINER flag and transfer amount from the engicart.
- This resolves a runtime only Cole would encounter, but still won't let
him put vodka in the engicart.
2015-02-10 07:32:14 -05:00
Markolie
354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
c1b6bba1ec Fix vulnerabilities in air alarm and APC, fix mitochondria log 2015-02-08 17:07:55 +01:00
Markolie
fba99e154d Accessory fixes 2015-02-08 14:55:32 +01:00
Markolie
8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Fox-McCloud
6e6b7deb8c Merge pull request #262 from tigercat2000/master
Locker open-close sound change
2015-02-07 23:43:32 -05:00
Tigercat2000
d92a0d1ef9 Locker sounds update- Instead of an istype() check in closets.dm, it now
uses the variable 'sound' which is present on every subtype of
structure/closet.
2015-02-07 22:43:28 +01:00
Artorp
a631697f91 Morgue Cleanup 2015-02-07 03:58:20 +01:00
Artorp
c616b42f67 Morgue indicator changes
- Fixed indicator not updating when clients log in/out
- Indicator added for when ghost can be cloned but not inside corpse
- Morgue now has a sprite for when a note is added to it
2015-02-06 15:07:15 +01:00
Fox-McCloud
f7c1c8b0e9 Spacesuit Buff 2015-01-31 23:36:56 -05:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -05:00
DZD
a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
Fox-McCloud
4ef4cce391 Merge pull request #216 from Fox-McCloud/Sec-Armor
Security Armor Buff
2015-01-24 21:58:07 -05:00
Fox-McCloud
74f51188d9 Security Armor Buff 2015-01-24 21:53:50 -05:00
DZD
5479a71f14 Merge with upstream/master 2015-01-24 18:52:51 -05:00
Fox-McCloud
4eed99a31a Merge pull request #214 from tigercat2000/master
Fixes possible runtime error with dressers
2015-01-24 18:41:40 -05:00
Fox-McCloud
6c3224fe75 Fixes and Such 2015-01-24 18:30:40 -05:00
Tigercat2000
09b926f0bc Modifies Dresser to accurate reflect lack of socks 2015-01-24 23:56:20 +01:00
DZD
73a1d7ba31 Brig Physician Vest
- Adds Brig Physician vest, sprite by TheFlagbearer.
- Makes changes to Brig Physician locker so that it no longer contains
sec gear, now contains one of every kind of medkit, a flash,
pepperspray, a brig physician vest, a doctor's jumpsuit, white shoes,
and a brig physician headset.
2015-01-24 17:21:05 -05:00
Fox-McCloud
1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -05:00
Fox-McCloud
edb6399552 Merge pull request #198 from SamCroswell/master
Add Smoothed Dark Windows, Ninja EMP Cost Increase
2015-01-21 21:39:46 -05:00
SamCroswell
c771ce1354 Add Smoothed Dark Windows, Ninja EMP Cost Increase
- The Ninja's EMP now costs an additional 1,000 to perform.

- Add smoothed dark shuttle windows, replace the Nukeops shuttle cockpit
window with smoothed shuttle windows.

- Remove the AI cameras from the Xeno shuttle, as the Xeno AI is no
longer existant.

- Re-map the Ninja outpost.

- Add security newscaster to the HoS's office.
2015-01-19 15:16:09 -05:00
Markolie
4312930a09 Fourth grab crushing re-added 2015-01-19 18:38:09 +01:00
Markolie
2cd437ee5f Fix window crushing 2015-01-19 18:35:45 +01:00
Fox-McCloud
09900a7b0c Merge pull request #188 from Markolie/master
Fix away mission atmos, bug fixes
2015-01-18 01:32:45 -05:00
Markolie
34a7bc645a Plasma iwndow coloring fix 2015-01-18 04:50:11 +01:00
Fox-McCloud
ad1614f737 Merge pull request #180 from Markolie/master
Shuttle fixes
2015-01-16 20:39:03 -05:00
Markolie
fb7fc04f51 Shuttle fixes 2015-01-17 02:33:19 +01:00
DZD
3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD
475ca3f666 Wizard Update Part 8
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Fox-McCloud
baa88a7463 Fixes 2015-01-15 19:42:15 -05:00
Fox-McCloud
159bf0f56c Flashbang-Headsets 2015-01-13 16:33:49 -05:00
Markolie
d1eadab31c Away mission fix 2015-01-12 04:29:53 +01:00
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Markolie
ca902cbede Curtains 2015-01-11 05:49:47 +01:00
Fox-McCloud
cb342a488b Merge pull request #139 from Markolie/master
Bug fixes, away mission port from /tg/
2015-01-09 08:07:41 -05:00
Markolie
c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
Markolie
c4da1e66d9 Fix wall smoothing 2015-01-08 19:44:56 +01:00
Fox-McCloud
81a4bfed43 Security Clothing 2015-01-07 23:11:52 -05:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Markolie
6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Fox-McCloud
ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00