Fox-McCloud
796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
ZomgPonies
e2a4ccc8a6
Merge pull request #681 from Fox-McCloud/End-Era
...
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
a40ee14f2c
Forgot
2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
Cheridan
acba4c6cf6
Adds construction permits
...
Conflicts:
code/game/gamemodes/objective_items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/modules/flufftext/Hallucination.dm
code/modules/paperwork/photography.dm
icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
ZomgPonies
17dfe4e481
Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs
...
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
2015-03-25 09:33:21 -04:00
Fox-McCloud
3e1fac8c94
[Goonchem] FirstAid Transitions
2015-03-25 08:45:36 -04:00
Fox-McCloud
dbb04f4dbb
[Goonchem] Few Additional Chemicals
2015-03-25 03:50:54 -04:00
Tigercat2000
9a19420ac3
Fix spelling error
2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-22 15:29:37 +01:00
ZomgPonies
8baa1e4ba9
Merge pull request #595 from Fox-McCloud/Bible-Farting
...
Proper Bible Farting
2015-03-19 01:42:19 -04:00
Fox-McCloud
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
Markolie
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8
Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/response_team.dm
maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
Markolie
9cbb93777e
ERT armory rework
2015-03-04 19:06:22 +01:00
Markolie
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
Markolie
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
DZD
69eb5509ec
Fixes exchange document objective
2015-03-01 20:35:09 -05:00
ZomgPonies
5a94b87331
Merge pull request #457 from Fox-McCloud/Cameras
...
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud
62462c876f
Camera Update+Camera Bugs
2015-02-28 04:01:14 -05:00
Fox-McCloud
923ba5932f
RnD Fixes and Tweaks
2015-02-27 17:36:20 -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
SamCroswell
c1c6c80eda
ERT - Emergency Box, Toolbelt Fix, PDA
...
The ERT's emergency box now contains:
- A survival knife
- A breath mask
- A full double-extended emergency oxygen tank
- A pair of night vision goggles.
- An inaprov autoinjector.
ERT engineering toolbelts now contain multitools. Whoops.
Add ERT PDAs, at Mark's request.
2015-02-24 13:02:15 -05:00
SamCroswell
cd7b1a4075
ERT Rework - Part One
2015-02-24 09:47:44 -05:00
Fox-McCloud
6fba118892
Merge remote-tracking branch 'upstream/master' into Fixes
2015-02-23 16:47:55 -05: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
Fox-McCloud
96a941ba19
Fixes and Guns
2015-02-22 16:32:35 -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
Markolie
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
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
Artorp
62f5006944
Ports mime backpack from /tg/station
2015-02-22 06:27:36 +01:00
Fox-McCloud
2a1028324c
Thickmaterial Flag
2015-02-21 07:26:25 -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
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
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
165f8118af
Add box of zipties, give zipties to nuke ops and Vox raiders
2015-02-14 14:54:32 +01:00
Markolie
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
Markolie
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
DZD
723dc2ad98
ABSTRACT flag addition & handling
...
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -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
ca90eca6f1
Replace surgical drill in syndicate medikit with combat defib
2015-02-09 23:36:54 +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
58323be9ad
Typo fixes
2015-02-09 03:31:06 +01:00
