54f59b9899
Pass II
2015-07-09 19:51:40 -04:00
0dbea7621f
The Great Del() Cull of 2015
2015-07-09 02:48:34 -04:00
4d9baf9936
Merge pull request #1358 from Fox-McCloud/sarin-tabun
...
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
a75a1165dc
Sarin->Tabun
2015-06-20 15:21:24 -04:00
93392f8e90
Explosion Rework
2015-06-20 04:13:55 -04:00
7178370044
Fixes various runtimes
...
Fixes:
- Body scanners runtiming from bad drag-drops
- Flashbangs runtiming when flashing humans without eyes
- Diona nymphs runtiming because they're not simple animals with an
environment_smash var
- A thrown object colliding with a non-existent limb runtiming
- Brains runtiming when redundantly removed
- Thrown objects runtiming when they can't find an area
2015-06-08 08:53:43 -04:00
e641c847d6
Merge pull request #1233 from Fox-McCloud/stun-balance
...
Stun+Weaken Balancing
2015-06-01 15:20:19 -04:00
e71bcdb9d0
Adds Grenade, Flash, and EMP in-hands
2015-05-31 16:39:41 -04:00
e098364432
Stun+Weaken Balancing
2015-05-31 06:35:14 -04:00
e056abfb82
3/3 port done
2015-05-25 20:16:34 -04:00
c485b7d45b
Fixes flashbang-on-nonhuman runtime
2015-05-25 07:42:53 -04: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
b8230aefe6
Nukies--Chemsprayer and New Grenades
2015-04-08 23:39:07 -04: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
7c739e4745
Merge pull request #710 from ZomgPonies/limb
...
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
0efdc07191
[Goonchem] Few Recipes Tweaks
2015-04-03 01:25:42 -04:00
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
b3270fe360
Merge pull request #650 from ZomgPonies/beartraps
...
IED fix and trap
2015-03-25 09:37:08 -04:00
dbb04f4dbb
[Goonchem] Few Additional Chemicals
2015-03-25 03:50:54 -04:00
cea9957062
MUH FIXES
2015-03-24 20:54:59 -07:00
8dfaa39ecb
Updates PR with Fox's suggestions
2015-03-24 19:27:05 -04:00
3f51d1135a
Re-adds old IED recipe, allows IED -> Beartraps
2015-03-24 09:10:10 -04:00
ba28d8e5b3
Incendiary Grenade
2015-03-20 17:02:22 -04:00
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
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
6d54e142eb
Update ghetto bomb explosion
2015-02-22 05:45:22 +01:00
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05:00
d0d000160b
And even moar nade logging from adminlog to attacklog
2015-02-12 02:44:28 -05:00
6cf4852a60
More nade logging from adminlog to attacklog
2015-02-12 02:41:33 -05:00
239c996b1c
Moved grenade logging from adminlog to attacklog
2015-02-12 01:58:34 -05:00
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
1a395dce03
Odds and Ends Changes
2015-01-23 21:57:00 -05:00
159bf0f56c
Flashbang-Headsets
2015-01-13 16:33:49 -05:00
fece84d974
Fixes-Tweakes
2014-12-14 03:18:10 -05:00
ae8f08e2b8
Fixes reflection, various security level fixes, gamma armory update, communication console fixes
2014-11-29 02:05:42 +01:00
f77eb5c914
Traitor Gear and Balance
2014-10-28 01:35:03 -04:00
d355956062
Added secrets - bomb log for more explosives
...
Chem grenades, ghetto grenades and standard grenades added. All log on
priming but not explosion.
2014-07-23 19:02:47 +01:00
44e2f8acf2
Fixes human internal organs list
...
Conflicts:
code/modules/events/organ_failure.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
5439b04241
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
code/global.dm
code/modules/mining/mine_turfs.dm
code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
3f6b32b15b
Fixes #5186
2014-06-20 08:05:09 -04:00
d49e6d3bf4
Standardize CLUMSY
...
Conflicts:
code/game/jobs/job/civilian.dm
code/game/objects/items/weapons/defib.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
22a2df1115
Standardize HULK.
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
a0d866b366
Popable cans and beer cans
2013-12-31 21:44:21 -05:00
5ce256b73c
Organ/Surgery Overhaul Part 1
2013-12-19 07:25:55 -05:00
Fox-McCloud