fe5fb2c0f8
Merge remote-tracking branch 'upstream/master' into job_refactor_tg
2017-02-25 05:42:47 -08:00
c5b897a951
Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers
2017-02-22 18:24:43 +01:00
e7023fd032
Refactored 'select equipment' to use outfit datums
...
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
35653d0cee
Merge pull request #6380 from uraniummeltdown/tanksprites
...
New Tank Sprites
2017-02-14 21:32:53 -08:00
2e6f341f70
Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2
...
Allows the Rapid Construction Device to set the name of a constructed Airlock
2017-02-14 13:34:21 -08:00
078ca5dd92
Fix examine
2017-02-13 19:30:22 +01:00
5c177320c3
Fix remaining welding tool inhands
2017-02-13 19:26:18 +01:00
e3eac9cdc7
Fix KA reskin mods and welding tool inhand
2017-02-13 19:12:26 +01:00
c4dd6f533f
Merge remote-tracking branch 'remotes/upstream/master' into tanksprites
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2017-02-13 21:01:58 +04:00
0e96552cf8
added back and belt sprites, double tanks use old belt sprites
2017-02-13 06:24:51 +04:00
e03981aa02
formatting tools.dm
2017-02-11 15:47:25 +04:00
1edc9a63e8
add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi
2017-02-11 15:46:38 +04:00
1bdc663053
add inhand sprites for tanks
2017-02-11 13:06:54 +04:00
c087647cce
Allows RCD to set constructed Airlocks name
...
Adds a new section of the Airlock menu of the Rapid Construction Device
so as to allow the user to specify the name the newly constructed
Airlock should have.
2017-02-10 18:57:04 +00:00
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
2d77a0ab4d
Merge pull request #6357 from Fox-McCloud/var-edit-fixes
...
On Varedit Fixes
2017-02-07 20:01:32 -08:00
d11dfa7a3b
Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
...
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-07 19:58:28 -08:00
685250501b
Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
...
Monkey cube refactor
2017-02-07 19:53:58 -08:00
7561459cb5
Merge pull request #6296 from KasparoVy/steal-storageimp-check
...
Traitor Steal Objective now Checks Storage Implants
2017-02-07 10:05:44 -08:00
ad2468196e
On Varedit Fixes
2017-02-07 08:44:50 -05:00
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
cc2eceb0a3
Merge pull request #6186 from Fox-McCloud/stunprod
...
Tweaks the Stunprod
2017-02-06 05:46:26 -08:00
249cd3279c
Merge remote-tracking branch 'upstream/master' into stunprod
2017-02-06 05:35:59 -05:00
dbe1284214
Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord
2017-02-06 01:42:32 +01:00
846ce475b2
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-05 13:58:24 -05:00
2c986259af
Fixes Iconless Banana Peels
2017-02-05 06:43:14 -05:00
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
7dd342743a
added cargo ID skin to agent ID and ID Computer
2017-02-05 09:19:52 +04:00
f8602ffef8
last fixes, hopefully
2017-02-04 04:28:42 -05:00
23139987a0
Tweak: Mr Chang's vending machine now refillable
...
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
2017-02-02 15:49:27 +00:00
78a2518135
Monkey cube refactor, pre-map
2017-01-31 20:44:52 -05:00
b55394ace3
Fix resource identifiers
2017-01-31 17:45:46 +01:00
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
4a9f7f28f7
Traitor Steal Objective now Checks Storage Implants
...
Does what it says on the tin. In assessing the completion of a steal
objective, storage implants will now be checked.
2017-01-31 05:01:23 -05:00
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
80587202fe
forcemove fixes
2017-01-27 21:03:57 -05:00
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
1d7de41acb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
a1ac4a9ec2
Merge pull request #6231 from Aurorablade/ThePowerOfSalt
...
THE POWER OF SALT COMPELS YOU
2017-01-26 10:52:44 -05:00
55e58ef471
honk
2017-01-26 10:39:48 -05:00
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
29c6a89f45
removes processed bread
2017-01-24 23:24:49 -05:00
36bfee25dc
last of the missing stuff, hopefully
2017-01-24 18:33:22 -05:00
318c339f11
icons are silly
2017-01-23 18:32:40 -05:00
eb4b320676
fox changes
2017-01-23 18:31:13 -05:00
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Tigercat2000