e7b2c1e53b
unEquip instead of drop_item
2015-06-14 00:08:32 +01:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
a6ae5dbe47
Increase max ammo for RCD, allow RCD to be loaded
...
with glass, metal, and plasteel, allow RCD to build
and deconstruct grilles and windows, add three RCDs
to the Engi-Vend machine
2015-06-13 15:40:06 +01:00
e90b472800
Fixed RCD wall deconstruction runtime.
2015-06-13 13:17:02 +01:00
3e07dbc5a9
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
dab13732fe
cleans up icon paths; modifies certain unary devices
...
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
they no longer override update_icon() but instead update like just about every other device
eventually I'll give these real sprites but given that they're unused it can wait for now
sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
4373f6eece
Merge pull request #9904 from xxalpha/runtimesrun
...
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
78ec879f27
- Ghosts can hear gang messages
...
- Gang spraycans no longer have a unique name for more stealth
2015-06-12 08:22:42 -06:00
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
9ba7e6aaf4
Fixes three runtimes.
...
Better fix. src. purge
2015-06-11 21:30:13 +01:00
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
808ffb4160
Merge pull request #9902 from Miauw62/inexperience
...
Removes strip_html_properly(), replaces it with html_encode().
2015-06-11 10:31:53 -05:00
1800c56456
Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL
...
Adjusts Chaplain Special Bible Equipment
2015-06-11 16:15:41 +01:00
a881478743
Removes strip_html_properly(), replaces it with html_encode().
...
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
59d9098d26
Gang Update
2015-06-10 23:05:58 -06:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
77b2e54de7
code improvement and overlays for fancy storage, dropper, syringe and lighter
2015-06-10 18:58:19 +10:00
b873176a77
Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
...
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
7ddcbb1967
Tweak and fixes
...
- Made the interactions into defines.
- Fixed a runtime for when an AI tries to set a DNA lock.
2015-06-09 14:45:38 -05:00
7c3cb399d0
Makes the game compile in byond version 508
...
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
2015-06-09 04:14:12 -07:00
1453513f03
cigarettes overlayed
2015-06-09 16:06:08 +10:00
d7e3363129
Merge pull request #9817 from xxalpha/dropfixes
...
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
d3fbacc224
Tweaks
...
- Sorts out the transfer_ai() proc, it can now be added to practically
anything you wanted to give to an AI.
- Moved mech functions to the unused middle click.
2015-06-08 20:46:01 -05:00
13b3e0d098
Tweaked core radiation values.
2015-06-08 18:58:41 +01:00
b572db24c5
Adds AI functionality
2015-06-08 18:26:41 +02:00
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
41feb1d911
Defined nuke state values. Tweaked core's process() and others.
2015-06-08 01:06:11 +01:00
209bc10caa
Several changes and additions: Added ability to steal a nuke.
2015-06-07 20:03:39 +01:00
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
0444bd82e4
FEATURE THREE: Airlock charges
2015-06-06 11:55:08 -04:00
3c59772025
Polishes the AI nerfs a bit:
...
* Removed camera wires.
* Tracking time is now dependant on distance to eye instead of core.
* AI detectors will light up when the AI tracks you.
Also added a changelog.
2015-06-06 16:51:09 +02:00
9cb1061bfb
Fixed hacking from inside machines and more.
2015-06-06 11:34:12 +01:00
ab4725f709
Makes the experimental welder only regen fuel while off.
2015-06-06 11:37:59 +02:00
9e65cdeb6a
Merge pull request #9391 from Ikarrus/gangmessaging
...
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
89e2fbf0bb
Adds the experimental welder to R&D + adds some descriptions.
2015-06-05 20:43:21 +02:00
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
05072bcf31
Merge pull request #9771 from xxalpha/dropitlikeits
...
Fixed PDA accepting items when spessmen can't drop items.
2015-06-04 20:04:04 -05:00
1443ee1c75
add icon for chemistry bag
...
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
8184d71a1e
add chemistry bag
2015-06-04 14:18:49 +01:00
ecb15b21c2
Fixed PDA accepting items when spessmen can't drop items.
2015-06-03 20:16:11 +01:00
e4999fd233
Merge pull request #9719 from CandyClownTG/patch-1
...
Ointments and bruise packs stacking
2015-06-03 00:51:02 -05:00
6618ead426
Readds The Clown Mask
...
lame gimmick chaplains rejoice i guess
2015-06-03 00:32:25 -05:00
6adb4c9507
Adjusts Chaplain Special Bible Equipment
2015-06-03 00:22:53 -05:00
a19f1801ff
Merge pull request #9699 from KorPhaeron/turf
...
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
2d998452db
Merge pull request #9715 from Firecage/datumspaths
...
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
d31f534446
Merge pull request #9745 from Incoming5643/super_bummer_man_64
...
Fixes overexcited TTV reporting
2015-06-02 22:04:20 -05:00
905f350597
Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
...
Conflicts:
code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
barackobama
Iamgoofball
xxalpha
Jordie0608
duncathan
Razharas
Ikarrus
Cheridan
Remie Richards
Miauw
Xhuis
GunHog
MrPerson
AnturK
Cheridan
Firecage
Dorsisdwarf