Commit Graph

18 Commits

Author SHA1 Message Date
Jordan Brown dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
swindly b8dae82098 adds suicide_act()s 2017-11-10 18:23:01 -05:00
MoreRobustThanYou 0f005901c6 You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 03:25:40 -06:00
Jordan Brown 8281df511a Removes force from slappers 2017-10-27 10:22:08 -04:00
Jordan Brown c54864d2ad --no-edit 2017-10-25 23:38:00 -05:00
Firecage afd8bb7be5 Code Consistency: luminosity --> light_range (#31355)
* Code Consistency: luminosity --> light_range

* Finally-remembers-to-update-PR is best lizard.

* Update singularity.dm
2017-10-22 01:06:07 -04:00
ShizCalev 362d304714 Fixes slapper inhand (#31793) 2017-10-17 12:35:00 -06:00
oranges cf3f3dc4ff Merge pull request #31699 from jughu/Misc
Increasew the size of the katana from normal to huge
2017-10-17 21:49:09 +13:00
jughu bac0576345 Update weaponry.dm 2017-10-14 11:34:32 +02:00
deathride58 33d59567a6 Adds Slappers (#31406)
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
2017-10-10 20:53:32 -04:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Armhulen bcbc16691b chainsaws rebalance, but working this time :) (#30399)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.
2017-09-09 01:00:34 +10:00
ShizCalev 129a7b9a0b Fixes brains counting towards highlander killstreaks (#30396)
* Fixes brains counting towards highlander points

* !QDELETED check, switched to only look for carbons
2017-09-07 12:14:16 +02:00
oranges 11cf723a95 Traitor, a traitor is a traitor.
Means that one of the crew members works for a criminal Syndicate and
must something to seize / kill someone / someone to protect and dump
from that Durkee on the shuttle. At English stations the word everyday,
for Russians for the mention of the word "traitor" is not in the chat
(IC) admins are stroking the head with a bangammer. So this word and
memetic.
2017-08-25 08:31:07 +00:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00