Nienhaus
060318cb29
Adds Deer ;D
2015-06-15 18:50:39 -05:00
Fox-McCloud
8a78887ba6
Blueshield Jacket Re-submission
2015-06-14 14:23:55 -04:00
Fox-McCloud
4eadd086d0
Fixes Wardrobes an Item Spawning
2015-06-04 20:13:18 -04:00
Fox-McCloud
296093951b
defib failed
2015-06-03 02:24:02 -04:00
Fox-McCloud
c5f16b538a
oops
2015-06-03 00:27:38 -04:00
Fox-McCloud
41512b0252
Exam Room Tweaks
2015-06-02 23:17:17 -04:00
Fox-McCloud
5d3e837b4a
Mob Refactor+Update and Pet Collars
2015-05-28 00:20:25 -04:00
FalseIncarnate
a1cce51559
Merge Conflict Fix, Attempt 2
2015-05-27 01:07:19 -04:00
FalseIncarnate
c385cb7f4f
Botany Belt, Biogenerator Additions
...
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.
Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.
Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.
All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.
Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
264369bdfa
issmall fixes and order of operations
2015-05-25 23:50:53 -04:00
ZomgPonies
e056abfb82
3/3 port done
2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe
2/3 of port done
2015-05-25 19:48:13 -04:00
Fox-McCloud
5b26b1ca59
Janitor--Bar of Soap
2015-05-23 20:50:12 -04:00
Fox-McCloud
1c1eec3210
Tweaks and Fixes 2.0
2015-05-22 16:29:12 -04:00
Fox-McCloud
8a5e3663df
Fixes and Tweaks
2015-05-15 21:58:24 -04:00
Tigercat2000
0a991322c3
MAP: Cyberiad, Corp jumpsuits, Engi curtains
...
This commit does the following:
- Adds a corporate wardrobe to security, equipped with 3
corporate jumpsuits and 3 corporate caps.
- Changes the shower curtain on the engineering outpost from a regular
curtain to an engineering curtain, because we have those now
2015-05-13 07:22:25 -07:00
FreeStylaLT
c290b1471e
Engineering berets changes
...
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Fox-McCloud
1b0ea1e226
Adds in Rings
2015-04-29 19:05:43 -04:00
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
Nienhaus