26ae8ac80e
Revert "Intercom build/destroy"
...
This reverts commit 3a2b2e906d
2015-05-02 00:19:27 -07:00
3a2b2e906d
Intercom build/destroy
2015-05-02 00:19:14 -07:00
62657448d4
Reintegrate mob fire
...
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
4f1053f5b7
LINDA, Stage 1
...
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.
The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
d755275599
Make violins and guitars f10 again
...
This commit makes violins and guitards have a force of 10 again,
because it was complained about.
2015-04-21 04:59:52 -07:00
3dacab94a8
Adds hitsounds to violin and guitar
...
they were missing them
now they aren't
fancy sproingy hitsound for guitar
2015-04-20 08:31:55 -07:00
29c59bd51b
Add check for antags in msg_admin_attack
...
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().
Goals of this commit:
- Make admin ATTACK: logs indicate if attacker is an antagonist.
Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
800b42f315
Merge pull request #751 from tigercat2000/Guitar
...
Ports Guitar from UristMcStation
2015-04-08 17:49:32 -04:00
5108942ed9
Merge pull request #752 from TheDZD/smoke
...
Chemistry Smoke Changes
2015-04-08 16:55:03 -04:00
810d626700
Smoke changes
...
- Changes smoke so that it immediately affects all mobs in its area of
effect, smoke clouds are purely visual.
- Any mobs in the area of effect of a smoke reaction will be affected by
the smoke's touch reaction, and have all reagents in the smoke container
transferred into them.
- Smoke clouds are no longer opaque.
- Mixing 10u potassium, 10u sugar, and 10u phosphorus or higher will
cause an area of effect with a radius of 3 from the point of reaction.
Any less will have a radius of 2.
- Same with heating 10u smoke powder.
- Smoke powder reaction now only yields 1 powder instead of 3.
- Vent clog event has a radius 3 area of effect.
Fixes and uncommenting
- Uncomments honey turf reaction.
- Uncomments synthflesh turf reaction.
- Adds list for reagents to not copy via smoke (or more specifically,
delete when a smoke reaction happens without copying). This includes
sugar, phosphorus, potassium, and the smoke "reagent" produced in a
smoke reaction.
2015-04-07 20:30:01 -04:00
71b0fcabba
Make guitars actually obtainable, via cargostore, and table crafting
2015-04-07 16:50:10 +02:00
df0f4791df
Adds a guitar!
2015-04-07 13:19:05 +02:00
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
4e9daf6aa8
Merge pull request #746 from jack-fractal/write-research-debug
...
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
9ca8def744
[Goonchem] Fixups
2015-04-05 21:56:59 -04:00
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
63337efdb8
DS Radio and Rapid Deployment Fix
2015-03-29 19:25:32 -04:00
0b630c4ca7
Merge pull request #691 from jack-fractal/pda_logs
...
Adding extra logging information to PDA for refactor prep
2015-03-29 01:02:05 -04:00
796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
f62f91f04e
Adding extra logging information to PDA
...
This significantly expands the level of detail for logging what PDAs.
2015-03-28 15:32:11 -04:00
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
617f2b8aec
guys, the medical analyzer upgrade, go get it
2015-03-24 18:44:39 -07:00
015c9d4a11
muh spans
2015-03-24 18:20:50 -07:00
44d9ef204e
snowflake code makes me *scream V2
2015-03-24 17:59:07 -07:00
f5f172652e
snowflake code makes me *scream
2015-03-24 17:58:10 -07:00
6b543f37ff
Merge remote-tracking branch 'upstream/master' into Health-Analyzer
2015-03-24 15:53:37 -04:00
69bc15604d
Health Analyzer Upgrading
2015-03-23 19:44:06 -04:00
aa5cdae070
Taperecorder Rework
2015-03-23 05:45:15 -04:00
ab963bdb10
Merge pull request #594 from Fox-McCloud/Overcharged-Flash
...
Overcharged Flash
2015-03-19 01:42:03 -04:00
74724e6936
Radio uplink refund fix
2015-03-17 22:54:21 +01:00
2b33c18bfe
Overcharged Flash
2015-03-17 17:10:24 -04:00
12aaa6a93e
Bug fixes
2015-03-17 16:16:44 +01:00
23bae14e9c
Fix monkeys picking up intercoms
2015-03-16 18:52:33 +01:00
b51850dfdd
Blueshield access change
2015-03-09 19:01:42 -04:00
9e57d2424f
Merge pull request #528 from TheDZD/nano_pai
...
NanoUI pAIs
2015-03-08 13:23:05 -04:00
d2d0627d43
NanoUI pAIs
2015-03-06 18:34:45 -05:00
8c34221110
Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix
...
Fixes
2015-03-06 12:55:24 -05:00
7e542873fe
Fixes
2015-03-06 01:13:03 -05:00
a911b53e8b
Life Proc Changes--Cold Space and and Temp Handling
2015-03-04 05:42:12 -05:00
838b3960cc
Fixes taperecorder emag_act()
2015-03-02 17:58:28 +01:00
6979cf6089
Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
...
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
9235af2a3d
Tweaking
2015-03-01 17:34:03 -05:00
f262c04a79
Merge pull request #476 from Markolie/master
...
Re-add borer event, adjust vine event weight, fix magistrate headset
2015-03-01 15:15:12 -05:00
3e01615ad7
Re-add borer event, adjust vine event weight, fix magistrate headset, mapfix
2015-03-01 21:04:11 +01:00
7799470ca5
Merge pull request #460 from Markolie/master
...
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
2015-03-01 12:30:15 -05:00
6b70bfec74
NanoUI update
2015-03-01 04:22:12 +01:00
84a1947c2f
Give Blueshield a bowman headset
2015-02-28 20:09:27 +01:00
62462c876f
Camera Update+Camera Bugs
2015-02-28 04:01:14 -05:00
140e767c01
Add dot to desc
2015-02-24 02:18:46 +01:00
SirBloodBuske