d04faba6c4
Machetes now fit on belts ( #4725 )
...
* Knives and machetes now fit on belts
* just machetes
2018-02-05 22:29:37 -06:00
72318d46b6
Replaces most of the gender macros. ( #4681 )
...
* Fixes #4632 .
* 1:27 am coding best coding
* fixes a warning
* Removes the last of the gender macros. Gender is dead.
* gender II: the travis-ing
* linebreaks are dead too.
* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
9016ca94c0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
...
# Conflicts:
# code/modules/mob/mob.dm - Whitespace? No real conflict.
# code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
ebc03cceac
Tweaks chainsaws. Again.
2018-01-19 21:11:48 -08:00
3c3dac7102
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
...
# Conflicts:
# code/_onclick/hud/hud.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-19 17:52:25 -05:00
674cc18554
Merge pull request #4582 from Mechoid/Tacknives_Angry_Again
...
Fixes Tacknife oversight. Fixes comments regarding knives.
2018-01-18 22:23:58 -06:00
4a6a1dbf5c
Fixes Tacknife oversight. Fixes comments regarding knives.
2018-01-18 14:20:55 -08:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
55845cb248
Drops the spear damage modifier from 0.75 to 0.5.
2018-01-17 13:41:05 -08:00
d8d769ac33
Chainsaw fix and cleanup ( #4538 )
...
* Fixes/Cleans up chainsaws.
* Further Chainsaw Updoots
2018-01-15 01:31:04 -06:00
96d3d361d0
Adds Boats, Ports /TG/ Buckling ( #4527 )
...
* Adds Boats, Ports /TG/ Buckling
* Travis Appeasement
* Changelog
2018-01-14 14:58:15 -06:00
ff02218ccb
Hatchets - > Machete subtype.
2018-01-12 21:21:18 -08:00
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -08:00
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
bde9ae6f7e
Adds Visual Cleavage
...
Axes executing a cleaving attack now has a visual effect to show the tiles that can potentially get hit.
Gives hatchets and the energy axe the ability to cleave.
2017-12-31 05:53:39 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
4d842c6590
Adds snowballs. ( #4414 )
2017-12-07 17:51:36 -06:00
5fffb9d51f
Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons
...
Adds Reach Variable to Weapons
2017-12-02 12:00:26 -06:00
3f21df1ae2
Fixy fixy. ( #4314 )
2017-12-01 16:18:20 -06:00
5796b14220
Adds Reach Variable to Weapons
...
Melee weapons can now potentially attack from farther away.
Obstacles are taken into account, so you cannot hit people through windows, but you can attack over specific things such as tables, or other people.
Currently only the spear can do this, with a range of two tiles, however the attack speed for the spear was reduced, so it may remain a situational weapon.
The intention for this is to make specific weapons feel different to each other besides 'does more damage', and I got ideas on other kinds of weapon adjustments later to make them feel a bit more unique.
2017-12-01 12:42:40 -05:00
af5c633cdb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
...
# Conflicts:
# code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
acb208dd3f
Works on New Blob
2017-11-29 22:35:01 -05:00
8ac2100fa2
Adds Exploration Equipment
...
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
1f9a14ffd7
Adds Skeletons for background use
2017-10-06 20:40:12 -05:00
dffb3a6fef
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe
...
# Conflicts:
# icons/obj/weapons.dmi
2017-09-28 16:07:45 -05:00
7a13c8136f
Finishing touches on gravemarkers
2017-09-27 18:59:26 -05:00
eed312a8fb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
...
# Conflicts:
# icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
47f2854bb7
Makes the scythe a child of fireaxes, adds it to the weed control crate
2017-09-26 22:15:33 -05:00
280f3010f8
Adds grave markers
2017-09-26 21:03:34 -05:00
eb341aaa65
Adds wooden buckets, craftable with botany.
2017-09-09 17:16:34 -04:00
5a02b7e5c7
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-10 22:41:51 -04:00
7b47590645
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
e48b548f2b
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-05 23:01:41 -04:00
ebe5cc916d
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
9d2df21777
Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
...
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
5dac8b91b6
Merge branch 'master' of ../Polaris into polaris-sync
2017-04-18 19:35:59 -04:00
6bd0f8742e
Finished coding makeshift armor.
2017-04-18 03:16:10 -04:00
843a59ca07
Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife.
2017-04-17 19:31:01 +01:00
7a4dc4bf79
Merge remote-tracking branch 'polaris/master' into polaris-sync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
5b4ab95bd5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor
2017-04-14 03:54:23 -04:00
95aff3ae40
Tweaks the message given when a weapon dulls
2017-04-12 16:22:17 -05:00
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
53b1b6dbc1
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling
...
# Conflicts:
# icons/obj/weapons.dmi
2017-03-28 22:57:00 -05:00
2f976a22f8
Merge pull request #3158 from Anewbe/fbp_screams
...
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
73ab115295
Fixes a thing.
2017-03-27 22:32:02 -05:00
a80ea977d1
Adds Boxcutters
2017-03-23 15:27:48 -05:00
cb23c72d8d
Adds the whetstone
2017-03-20 23:32:52 -05:00
mistyLuminescence