Commit Graph

15048 Commits

Author SHA1 Message Date
PKPenguin321 3dd20078ae big update
removes all counter/blocking related code and the related sound effect
makes krav maga use action buttons instead of verbs
renamed quick choke to lung punch
reduced stun time on leg sweep
removed head elbow, removed the help button (obsoleted by tooltips)
2016-04-15 17:32:05 -07:00
PKPenguin321 c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
Cheridan 9e85fe81be Merge pull request #16743 from TrustyGun/flask
Changes Flasks a little
2016-04-12 00:03:19 -05:00
Cheridan c5230dec86 Merge pull request #16789 from KorPhaeron/ash2
Less ash lizard starting loot
2016-04-11 23:56:45 -05:00
KorPhaeron 51eee26d54 Merge pull request #16795 from octareenroon91/juggling-for-golems
Pickaxe portability
2016-04-11 20:07:24 -05:00
Joan Lung 28d543aa8b Merge pull request #16704 from Incoming5643/Its_3_am_and_I_am_too_dazed_to_make_a_clever_branch_name
Tongues
2016-04-11 19:44:36 -04:00
Incoming dfc6e55eaf Implements Cheridan's tongue sprites. Oh baby. 2016-04-11 19:23:05 -04:00
KorPhaeron 36b5122709 Merge pull request #16786 from TechnoAlchemisto/emote_fix
Fixes a simple animal emote.
2016-04-11 10:35:18 -05:00
duncathan salt e20b7caffe dumb 2016-04-11 08:37:16 -06:00
duncathan salt aab7fdbde9 fix 2016-04-11 08:35:05 -06:00
KorPhaeron 4ea85ca6e1 Merge pull request #16781 from RandomMarine/golemship
Golem ship tweaks and additions
2016-04-11 09:18:53 -05:00
Jordie 8c5a12aec5 Merge pull request #16797 from tgstation/509compatibilitywillbemaintaineduntil510isreleasedasastableversionofBYOND
improves parse_gas_string(); fixes 509 support
2016-04-11 16:11:21 +10:00
duncathan f35306eda3 it works now 2016-04-10 23:40:20 -06:00
RandomMarine 0c48762aee Removed comment. 2016-04-10 21:31:54 -07:00
duncathan c67285e5a1 improves parse_gas_string(); hopefully fixes 509 support 2016-04-10 19:28:24 -06:00
octareenroon91 5b6680d905 Pickaxes - but not drills - can now be equipped to the back. I copied the sprite for spears for visibility when worn on the back. 2016-04-10 19:30:29 -05:00
KorPhaeron fae517c1c0 No guns for ash lizards 2016-04-10 19:16:13 -05:00
RandomMarine 9a6b11e785 Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship
# Conflicts:
#	config/admins.txt
2016-04-10 17:13:19 -07:00
Cheridan a1eb2d459b Merge pull request #16729 from RemieRichards/holomap_port
Station blueprints improvements
2016-04-10 13:40:34 -05:00
Cheridan 0e012e5c55 Merge pull request #16719 from CosmicScientist/QoL_PA
Changes PA computer sprite and fixes east facing sprites
2016-04-10 13:11:59 -05:00
Cheridan f650cf0e0d Merge pull request #16720 from RemieRichards/client_colour_handler
Adds a priority system for client.color effects
2016-04-10 13:06:22 -05:00
Joan Lung 47775c6816 Merge pull request #16763 from coiax/emagging-cargo-for-the-posters
Emagging cargo console also unlocks contraband
2016-04-10 11:45:38 -04:00
TechnoAlchemist a30b6a7502 fixes an emote. 2016-04-10 01:00:40 -07:00
Shadowlight213 a6db6f0d1a Adds a cryostorage version of the ghost spawner. (#16466)
* Adds An infinitely reusable version of the mob spawner.

* uses

* Fixes

* updates a comment.
2016-04-10 15:42:54 +10:00
RandomMarine af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Incoming 513d5b12dc Generalize the system down to carbon, adding a xeno tongue that handles the actual hissing sound.
Moves the tongue organ to the mouth
Fixes up synth inheritances
Losing your tongue no longer makes you silent, but rather just makes you a lot harder to understand
Little misc things
2016-04-09 21:55:44 -04:00
CosmicScientist 45ac330702 removes computer sprite change, adds mouse_opacity 2016-04-10 01:52:08 +01:00
Cheridan 4f108b6913 Merge pull request #16745 from coiax/muh-ore-box
Ore box changes
2016-04-09 15:43:02 -05:00
Jack Edge 71ffa79379 Changed WOOD variable to wo 2016-04-09 20:34:39 +01:00
Jack Edge 8c4d4df68d Ore box deconstruction with a crowbar 2016-04-09 20:20:32 +01:00
Joan Lung 0af8681bb7 Merge pull request #16724 from coiax/my-best-friend-is-a-holocarp
My best friend is a holocarp
2016-04-09 14:19:18 -04:00
coiax daecc5983b Revert "HERES YOUR CODE FIX SIR" 2016-04-09 19:10:26 +01:00
Jack Edge bb1e021b95 Added emagging the cargo circuit board
In addition, a circuit once emagged will be unable to return to
only legitimate channels.
2016-04-09 18:32:26 +01:00
Jack Edge fe07608196 Emagging cargo console also unlocks contraband
Using an emag will also unlock some of the speciality crates that you would
normally have to multitool the cargo circuit board for.
2016-04-09 15:45:01 +01:00
TrustyGun 022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
AnturK fee254926e Merge pull request #16680 from Core0verload/nomoremagic
Wizard events will no longer fire unless actually summoned by a wizard
2016-04-09 15:57:30 +02:00
AnturK 86eee6605d Merge pull request #16478 from GunHog/WJ_Likes_To_Inspect_His_Xenos
Xenomorph changes and features
2016-04-09 12:23:20 +02:00
KazeEspada c6eaacac78 Refactors guardian code so that the name datums do everything. Makes it so that guardians can use an overlay system. 2016-04-09 00:29:36 -07:00
KorPhaeron d06a1ea62e New Mining Loot (#16718)
New Mining Loot
2016-04-09 05:21:06 +01:00
Cheridan 5b526b1cb6 Merge pull request #16517 from bgobandit/fluffstocks
Localizes stock text.
2016-04-08 22:57:46 -05:00
Remie Richards 637f451b9a Merge pull request #16708 from Bawhoppen/pinremovaltweak
Pin removal recipe change
2016-04-09 03:35:09 +01:00
bawhoppen 5c513649dd changes welding tool requirement 2016-04-08 21:12:18 -05:00
TrustyGun 0b3779ab11 removes the cap's flask from spawn code and replaces the one in his office with his new one 2016-04-08 20:11:24 -04:00
GunHog d67feceb07 Forgot to close the span 2016-04-08 18:26:58 -05:00
GunHog 8ed74088c1 Dropper change
- Droppers once again work on all mobs, but now do not work on aliens.
1000% more snowflake yet less anger inducing!
2016-04-08 18:25:23 -05:00
KorPhaeron 82786783f4 Merge pull request #16716 from coiax/plant-genes
Added a "plant DNA manipulator" to Botany backroom
2016-04-08 16:34:34 -05:00
Jack Edge 0465ea35f8 Fixed inaccurate description of design item 2016-04-08 22:25:05 +01:00
Jack Edge a066e1f3b4 Changed "the" to "/the"
I don't know why I did this, I was told to.
2016-04-08 21:49:42 +01:00
KorPhaeron 05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate
You can no longer drop survival capsules on top of dense objects
2016-04-08 13:36:29 -05:00
Cheridan 108eefb86c Merge pull request #16705 from Shadowlight213/adminghostruntime
Fixes a runtime with IsAdminGhost
2016-04-08 12:39:01 -05:00