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
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
Markolie
4d8481f83a
Merge surgical borgs and crisis borgs
2015-02-16 22:47:55 +01:00
Markolie
8726bad5b0
Z-level check refactor
2015-02-16 20:33:28 +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
165f8118af
Add box of zipties, give zipties to nuke ops and Vox raiders
2015-02-14 14:54:32 +01: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
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
Markolie
6938ad7edc
False rwalls now smooth with regular walls and vice versa
2015-02-12 23:37:54 +01:00
ZomgPonies
d0d000160b
And even moar nade logging from adminlog to attacklog
2015-02-12 02:44:28 -05:00
ZomgPonies
6cf4852a60
More nade logging from adminlog to attacklog
2015-02-12 02:41:33 -05:00
ZomgPonies
e9b413b1ff
Moved broken/deanchored window logging from adminlog to attacklog
2015-02-12 02:16:55 -05:00
ZomgPonies
4d2ccff974
Moved bomb logging from adminlog to attacklog
2015-02-12 02:04:32 -05:00
ZomgPonies
239c996b1c
Moved grenade logging from adminlog to attacklog
2015-02-12 01:58:34 -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
Fox-McCloud
c78368a3e8
Merge pull request #281 from ZomgPonies/master
...
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
2015-02-10 21:35:48 -05:00
Fox-McCloud
c2f84b67f0
Merge pull request #279 from Markolie/master
...
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
2015-02-10 21:35:30 -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
Artorp
e3de04412e
Fixes detective polietape
2015-02-10 07:47:58 +01:00
ZomgPonies
39619bdf62
Tuned Singuloth Knight item balance.
2015-02-09 22:41:20 -05:00
Markolie
3a4679bce7
Remove zeroth law with own board
2015-02-10 03:06:43 +01:00
Markolie
ca90eca6f1
Replace surgical drill in syndicate medikit with combat defib
2015-02-09 23:36:54 +01:00
Markolie
c2058c4a9d
Update our /Topic code to prevent exploits
2015-02-09 18:22:22 +01:00
Markolie
2c578ee759
Fix backward check
2015-02-09 17:13:53 +01: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
Fox-McCloud
857ca4c3bd
Merge pull request #265 from Artorp/DisabilityFixes
...
Disability fixes
2015-02-09 00:23:01 -05:00
Markolie
58323be9ad
Typo fixes
2015-02-09 03:31:06 +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
Artorp
69f5776aee
Disability fixes
...
- Disabilities properly updated when new player is made
- Fixed epilepsy disability not linked to proper SE block
2015-02-08 14:20:57 +01:00
Fox-McCloud
af78338a99
Nerfborgs
2015-02-08 00:22:13 -05: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
Fox-McCloud
4d89f5b086
Merge pull request #256 from Artorp/MorgueChanges
...
Morgue indicator changes
2015-02-07 12:29:05 -05:00
Fox-McCloud
94eccfffcc
MetaToys
2015-02-06 23:25:13 -05: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
