Neerti
7fab70767d
colony-1 could not be saved, unfortunately. RIP
2015-08-23 18:04:47 -04:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
PsiOmega
e48fbdd1e6
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
mwerezak
4396e5a5bc
Merge pull request #9891 from Zuhayr/dev
...
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
...
Conflicts:
code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
PsiOmega
d001489d14
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
Zuhayr
bf313ae238
Merge pull request #9851 from mwerezak/armourpen
...
Adds armor penetration system
2015-08-22 02:22:17 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
SinTwo
9b51c352ae
AS-24 Fix #2 + ignore
...
Ignore hides database config for hopeful database fix(?)
2015-08-18 18:09:48 -04:00
PsiOmegaDelta
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
SinTwo
5b1b79df6d
Fixes/Adds AS-24 Shotgun
2015-08-16 21:36:36 -04:00
SinTwo
14b2114598
AS-24 Shotgun
...
Adds the AS-24 Shotgun.
2015-08-16 19:28:06 -04:00
mwerezak
77ddae4e26
Structures now take damage properly from projectile clouds
2015-08-15 19:08:45 -04:00
mwerezak
8b08f8ff34
Fixes explosions deleting projectiles
2015-08-15 02:51:02 -04:00
mwerezak
4092b40ae5
Updates frag grenades to use bresenham, tweaks
2015-08-15 02:41:32 -04:00
HarpyEagle
6404d02c38
Adds changelog and tweaks PTR penetration.
2015-08-15 02:19:23 -04:00
mwerezak
da58494275
Improves the way shrapnel clouds hit prone mobs
2015-08-14 00:25:41 -04:00
Chinsky
822d48928b
Fixes caps getting stuck in air forever.
...
Also apparently just being nodamage 0 damage non-sharp bullet is not enough to stop suicide from working -_-.
2015-08-14 06:19:35 +03:00
Chinsky
b01a41d766
Merge branch 'capgun' into russian_roulette
2015-08-14 06:03:33 +03:00
Chinsky
b4ec03b871
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
2015-08-14 05:57:00 +03:00
Chinsky
328621b860
Moved cap guns to proper guns.
2015-08-14 05:51:29 +03:00
HarpyEagle
2e8f927085
More descriptive variable name
...
Renames armorpen to armor_penetration
2015-08-13 22:38:28 -04:00
mwerezak
0cf21df8b5
Adjusts projectile values
2015-08-13 22:37:47 -04:00
Chinsky
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
PsiOmegaDelta
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Chinsky
ac80136603
Merge pull request #10184 from mwerezak/projectile-cleanup
...
Projectile code cleanup
2015-08-13 07:26:58 +03:00
Chinsky
21f7c8234d
Merge pull request #10473 from mwerezak/firemode-cleanup
...
Streamlines gun fire modes
2015-08-13 07:22:28 +03:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
PsiOmega
78ffb5835a
Misc.
2015-08-11 17:33:03 +02:00
PsiOmegaDelta
3185005496
Fixes #10410 . Fixes #10411 .
...
Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often.
Also removes completely unused code.
2015-08-11 13:36:56 +02:00
mwerezak
cb2a094553
Adds fragmentation grenades
...
Adds a fragmentation grenade item that launches a shower of projectiles
in all directions when detonated.
2015-08-11 02:42:25 -04:00
HarpyEagle
8cbd14c1a5
Splits up projectile/launch()
2015-08-10 19:00:38 -04:00
HarpyEagle
53affb4e44
Projectile cleanup
...
Moves projectile trajectory related setup into setup_trajectory(), removes
redundant target var on test projectiles.
2015-08-10 18:56:41 -04:00
HarpyEagle
ad54aca3ab
Streamlines gun firemodes
...
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
2015-08-10 14:38:08 -04:00
PsiOmega
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
mwerezak
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
PsiOmegaDelta
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
Chinsky
b362be9bb1
Russian roulette
...
Fun for whole sec team!
2015-07-29 16:15:24 +03:00
mwerezak
6df770cab3
Fixes projectiles being able to hit humans in organs they do not have.
...
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
2015-07-28 20:23:26 -04:00
mwerezak
d203362d38
Fixes #10258
...
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
2015-07-28 20:17:32 -04:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
Dragor
697157a6bc
Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.
2015-07-15 22:08:21 -04:00
Zuhayr
c779482afc
Merge with dev.
2015-07-15 16:20:39 +09:30
Zuhayr
03927918c6
Merge pull request #10187 from Baystation12/master
...
Master > dev-freeze
2015-07-15 16:10:13 +09:30
HarpyEagle
be34a7cfc7
Fixes projectiles ignoring their specified target zone
2015-07-14 14:20:53 -04:00
