Svej
a0e1cd5683
Nanotrasen Representative hat
...
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02: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
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
Cheridan and Tigercat2000
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
Fox-McCloud
b30d3f795f
Goonchem Map Changes
2015-03-24 22:48:25 -04:00
Fox-McCloud
8da3cb1de5
Merge pull request #616 from tigercat2000/BorgIlocker
...
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Tigercat2000
689713ddbd
Add clickdelay to attacking statues
2015-03-22 18:24:20 +01:00
Tigercat2000
b9adc59d26
Allow borgs to open-close lockers properly
2015-03-21 14:28:29 +01:00
Fox-McCloud
01fa55adda
Test Lab
2015-03-20 07:11:30 -04:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
Fox-McCloud
a31cdc9091
Merge pull request #572 from SamCroswell/NinjaDev
...
Ninja Restructure
2015-03-15 16:58:41 -04:00
SamCroswell
62ae69c816
Ninja File Structure Rework
...
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.
Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
SamCroswell
65b530fbe6
Locker Fix - Part Zwei
2015-03-08 21:01:01 -04:00
SamCroswell
03a13fca3a
Locker Fix
2015-03-08 20:53:47 -04:00
Fox-McCloud
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
Fox-McCloud
3bed31e08c
Chemistry Cleanup and Fixes
2015-03-01 16:34:23 -05:00
Markolie
e4328a7f5e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
2015-02-28 17:13:53 +01:00
Markolie
f7426c8d72
Add bandanas, mask toggling, camo armor jacket and bugfixes
2015-02-28 17:09:45 +01:00
Fox-McCloud
30465b03d6
Telescopic Riot Shield
2015-02-27 07:31:03 -05:00
ZomgPonies
d14c4e4f58
Merge pull request #431 from Fox-McCloud/Lasers-Tasers
...
Laser Additions and Taser Nerf
2015-02-26 22:49:46 -05:00
ZomgPonies
2f9b435a0f
Merge pull request #426 from Markolie/master
...
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
Fox-McCloud
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -05:00
ZomgPonies
887e4b93f7
Ported outside crate manifest
2015-02-25 14:02:14 -05:00
Markolie
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +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
377dfe894d
Add attack animations
2015-02-22 21:15:54 +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
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -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
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -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
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
Markolie
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01: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
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
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
f7c1c8b0e9
Spacesuit Buff
2015-01-31 23:36:56 -05:00
Svej