31e4487229
Fix for #2430 .
2013-06-27 14:10:05 +03:00
be16c8eff3
Fixes #2957
2013-06-22 20:07:21 -07:00
09d0bb7f8e
Merge pull request #3039 from Furlucis/master
...
Typo fixes
2013-06-11 12:21:16 -07:00
076f4c9d9a
Figured I should finally commit it, since exams are over now~
...
Radios start off by default. Should decrease the amount of tcomm lag.
2013-06-11 23:09:44 +04:00
360bde9f83
Fixed some typos. (feotal, "/red ...")
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-06-11 15:01:48 -04:00
bc2db268cc
Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.
2013-06-10 17:16:54 -07:00
29bffb0c20
Merge branch 'master' into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-06 21:32:08 -04:00
17b8a2dc8a
- reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight
2013-06-06 20:50:22 -04:00
f4441b5019
refactoring the Stat function for silicon lifeforms
...
adding messenger functions to cyborgs and refactoring the AI's IM system
2013-06-06 20:46:46 -04:00
df75d25cb3
Map conflict, using BEF.
2013-06-06 10:40:22 +09:30
57c1ebb285
Merge pull request #2977 from MagmaRam/master
...
Fix for security belts not holding all seven items sometimes
2013-06-05 06:21:47 -07:00
ae697179c9
Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them.
2013-06-05 20:14:11 +07:00
9e71180e1b
Merge conflict resolution, using BEF.
2013-06-05 14:22:04 +09:30
11ae345509
Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option.
2013-06-04 18:34:43 -04:00
799ed74a3c
Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)
2013-06-04 13:47:26 +04:00
63f9549596
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle
...
Conflicts:
baystation12.dme
2013-06-01 17:12:51 +04:00
606a510168
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-05-31 22:58:01 -05:00
24098c6529
UNadded robotic hands and feet because there was no point in doing this in the first place.
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-05-31 22:32:39 -04:00
e32b253a41
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-05-31 20:01:57 -04:00
06b7700086
Cobpipe fix
...
Smoking pipe icon fix.
Eye-stab admin logging fix.
Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773
Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
2013-05-31 00:09:00 -05:00
3409e1f05d
Toolbelts can hold engineering tape.
2013-05-30 19:35:03 +03:00
50f05f7a11
Pill bottles can hold paper.
...
For prescriptions and such.
2013-05-30 19:28:34 +03:00
d45073a5ab
Added new item - hailer. Use in hand to make it say HALT! SECURITY!
...
Should help in asking people to halt while running.
2013-05-28 03:12:58 +04:00
08524aa4d2
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-05-27 01:48:44 -04:00
cab1289511
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
html/changelog.html
2013-05-26 20:43:22 +02:00
13e2d8d793
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-05-26 05:02:07 +04:00
1d5d7cb901
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-05-24 06:52:03 -04:00
c1e701f32b
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-05-24 05:23:36 -04:00
ef2c7af6a0
Telescopic baton message fix.
...
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
2013-05-23 16:24:53 -04:00
b5217d862a
A few fixes to rp-rev
...
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
2013-05-23 22:12:20 +02:00
ce19719700
Fixed two problem with airlock/APC commit:
...
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
2013-05-23 19:47:33 +02:00
aa6bfc33c7
Airlock and APC changes.
...
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00
bdb16b1f99
Renamed bruise pack back to gauze.
...
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
ebe2e26ed3
Fixes the Syndicate nuke shuttle airlock (In that it cycles now)
...
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
2013-05-19 05:00:06 -04:00
f5b0b52b6c
Added stasis bag.
...
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00
c170f57ba7
Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once.
2013-05-18 06:48:01 -04:00
27759f47df
Merged master into BEF.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-05-06 15:43:50 +01:00
fed2bfcedc
fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me.
2013-05-02 02:00:04 -07:00
0acd40326f
Increased pill bottle capacity to 14 pills (2 rows).
...
Also fixed #2714 .
2013-04-30 15:44:31 +04:00
e256f2d095
should nerf nanopaste
2013-04-24 19:42:19 -04:00
390029007d
Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.
2013-04-23 22:52:08 +01:00
17860ff33a
Added robotic hands and feet.
...
Apply screwdriver to robotic arms and legs to get hands/feet. They can
be surgically attached properly, far as I can tell. Also, fixed a few
backwards slashes in text marcos.
2013-04-19 00:41:45 -04:00
2f6fdf556d
final tweak for cap's PDA to do as advertised.
2013-04-18 09:56:51 -07:00
cda1248be7
Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes.
...
Tweak: Removes captain's armour from spawn code.
Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
2013-04-18 09:56:50 -07:00
f05b8e0083
Fixes issues:
...
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely. Possible cause of #2627 and maybe #2451 , but those need tested and I did not have time.
2013-04-18 09:56:49 -07:00
e40ff1bfc4
No need for dis shit.
2013-04-17 14:21:44 +04:00
09212483bc
final tweak for cap's PDA to do as advertised.
2013-04-16 08:47:23 -07:00
19c7c8d651
Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes.
...
Tweak: Removes captain's armour from spawn code.
Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
2013-04-16 08:43:19 -07:00
44401cf03e
Fixed blood overlays for batons. Also,changelog.
2013-04-15 22:23:09 +04:00
d8f825894a
Telescopic baton, biatch. Bastard child of baton and energy sword.
...
Added one in HoS's locker.
2013-04-15 02:47:48 +04:00
Segrain