ZomgPonies
5421754760
Merge pull request #418 from Fox-McCloud/Fixes-Genetics
...
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Markolie
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
Markolie
6efa3bcdaa
Fix trays (now bags)
2015-02-25 20:42:43 +01:00
ZomgPonies
710d60abda
GC fixes
2015-02-25 10:58:56 -05:00
Fox-McCloud
85d79677b1
Fixes, Genetics, and Balance
2015-02-24 22:58:05 -05:00
Markolie
b44255d250
Bug fixes
2015-02-24 18:57:12 +01:00
Mark van Alphen
8457375738
Merge pull request #391 from ZomgPonies/schedule
...
Goon process scheduler
2015-02-23 19:46:17 +01:00
ZomgPonies
e9288c614b
Merge pull request #388 from Markolie/master
...
Remove click delay, standardize mutations, attack animations, attackby() params addition
2015-02-23 12:47:25 -05:00
Mark van Alphen
130ed7e18c
Merge pull request #381 from Artorp/MimeDoor
...
Gives the mime his very own door and ports /tg/ mime backpack
2015-02-22 22:29:03 +01:00
ZomgPonies
2c50a42ba7
Goon process scheduler
2015-02-22 15:24:46 -05:00
Markolie
377dfe894d
Add attack animations
2015-02-22 21:15:54 +01:00
Artorp
772e931706
Mime backpack: Mandatory & added to supply crates
2015-02-22 20:45:26 +01:00
Markolie
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
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
ZomgPonies
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Markolie
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
Fox-McCloud
2a1028324c
Thickmaterial Flag
2015-02-21 07:26:25 -05:00
DZD
5e977cbfc9
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-20 19:05:25 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
Fox-McCloud
99d92aea35
Buckshot
2015-02-20 04:46:53 -05:00
DZD
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -05: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
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
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01: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
95e18fd397
Solar update, convert solar to NanoUI
2015-02-16 21:35:34 +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
Fox-McCloud
a21f5f5048
Fix
2015-02-14 22:04:19 -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
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
Markolie
71319538df
Vending machine overhaul, teleporter area fix, add events to status tab
2015-02-13 15:27:42 +01:00
DZD
33b69df330
Objective bugfixes.
...
- Should fix the assigning of the identity theft objectives
- Fixes changelings greentexting identity theft when they shouldn't.
- Possibly fixes AI name issue with destroy objective.
2015-02-11 19:03:46 -05:00
Fox-McCloud
dbd2063561
Merge pull request #286 from FalseIncarnate/master
...
[Feature] Food Carts
2015-02-11 16:53:55 -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
Markolie
c507158b8f
Camera code update, fix runtime
2015-02-10 15:42:47 +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
3a4679bce7
Remove zeroth law with own board
2015-02-10 03:06:43 +01:00
DZD
4e93cc5203
Merge with upstream/maser
2015-02-09 18:22:19 -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
c16e28ef71
Remove webbing crate
2015-02-09 03:14:48 +01:00
