bfe8a12f1e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
887e4b93f7
Ported outside crate manifest
2015-02-25 14:02:14 -05:00
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +01:00
5c14d9c5f2
vg Garbage Collector
2015-02-23 17:18:38 -05:00
8f5bddbb32
Fix compile error
2015-02-22 22:29:58 +01:00
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
377dfe894d
Add attack animations
2015-02-22 21:15:54 +01:00
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
3b072b5a62
Remove click delay from most things
2015-02-22 18:47:58 +01:00
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
cb732b2b2d
Adds celsius to the freezer/heater
2015-02-21 22:14:02 +01:00
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
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
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
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
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
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01:00
3bc771b15b
Merge pull request #314 from Fox-McCloud/Cargo
...
Cargo
2015-02-16 06:52:16 +01:00
1fdd281f19
Critter Crate Fix
2015-02-15 03:19:43 -05:00
dbf4c84953
Merge pull request #311 from Markolie/master
...
Ziptie restraint examine, fax panel adjustment
2015-02-14 23:23:35 -05:00
1e4d1df880
Merge remote-tracking branch 'upstream/master' into Cargo
2015-02-14 22:02:39 -05:00
0de7e1035c
Cargo Supplies
2015-02-14 21:21:09 -05:00
0792a40379
Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box
2015-02-14 22:31:31 +01:00
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
47e4126277
Add send time to fax, fix nest issue
2015-02-14 04:56:09 +01:00
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
113fd94e88
Fix dressers to actually work. [BUGFIX]
2015-02-13 23:04:04 +01:00
6938ad7edc
False rwalls now smooth with regular walls and vice versa
2015-02-12 23:37:54 +01:00
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05:00
e9b413b1ff
Moved broken/deanchored window logging from adminlog to attacklog
2015-02-12 02:16:55 -05:00
dbd2063561
Merge pull request #286 from FalseIncarnate/master
...
[Feature] Food Carts
2015-02-11 16:53:55 -05:00
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
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
64fe9e8600
Remove legacy viewpoint code, move back to Bay's and /tg/'s system
2015-02-10 17:02:27 +01:00
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
354e569f9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
7285f39fc1
Defib update, cell path update
2015-02-09 16:12:01 +01:00
c1b6bba1ec
Fix vulnerabilities in air alarm and APC, fix mitochondria log
2015-02-08 17:07:55 +01:00
fba99e154d
Accessory fixes
2015-02-08 14:55:32 +01:00
8fae0f029f
Accessory overhaul
2015-02-08 14:29:10 +01:00
6e6b7deb8c
Merge pull request #262 from tigercat2000/master
...
Locker open-close sound change
2015-02-07 23:43:32 -05:00
Markolie