Commit Graph

560 Commits

Author SHA1 Message Date
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
DZD c11bb0d283 Fixes bugs
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
2015-02-19 19:32:58 -05:00
Markolie 46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Mark van Alphen 3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo
Cargo
2015-02-16 06:52:16 +01:00
Fox-McCloud 1fdd281f19 Critter Crate Fix 2015-02-15 03:19:43 -05:00
Fox-McCloud dbf4c84953 Merge pull request #311 from Markolie/master
Ziptie restraint examine, fax panel adjustment
2015-02-14 23:23:35 -05:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie 0792a40379 Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box 2015-02-14 22:31:31 +01:00
ZomgPonies 091d2c8348 Merge pull request #307 from Markolie/master
Fix atmos meter, emag refactor, vending machine update, UI reworks, admin fax overhaul, other fixes
2015-02-14 09:17:52 -05:00
Markolie 47e4126277 Add send time to fax, fix nest issue 2015-02-14 04:56:09 +01:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Tigercat2000 113fd94e88 Fix dressers to actually work. [BUGFIX] 2015-02-13 23:04:04 +01:00
Markolie 6938ad7edc False rwalls now smooth with regular walls and vice versa 2015-02-12 23:37:54 +01:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
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
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -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