Commit Graph

1256 Commits

Author SHA1 Message Date
shazbot194
00444598d9 fix for l6 description and paper hat sprites
Changes the description of the L6 from 7.62 to 5.56 so it matches both
its ammo and magizine caliber.
Adds in paper_words sprites to head, and hands so when you have a paper
that is writen on, it can both be seen when holding and when wearing as
a hat.
2016-11-22 11:16:32 -09:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization
Reagent Reorganization
2016-11-21 16:54:41 -08:00
TullyBurnalot
71b64bbb5a Fixes Gun Renaming
- Renaming guns now only produces 1 input box
2016-11-12 01:32:50 +00:00
Fox-McCloud
14e2eb8eb0 consumables 2016-11-08 10:26:29 -05:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Markolie
61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
Markolie
0bfb2d7612 Bow fix 2016-10-25 14:43:11 +02:00
Markolie
e5c4b78f47 Add Colossus, add outdoors variable to areas and update fireball targeting 2016-10-25 04:10:52 +02:00
Markolie
5ace926e42 Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking. 2016-10-25 00:50:31 +02:00
Markolie
88b2bf1a28 X-01 grammar fix 2016-10-24 16:43:30 +02:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Fox McCloud
4874d1c95c Merge pull request #5695 from FlattestGuitar/logs
Renames some bullets so they're easier to track
2016-10-12 17:15:27 -04:00
FlattestGuitar
15684d4850 Only bullets now 2016-10-12 23:07:01 +02:00
shazbot194
b6fef2185c Changed the way smg & toy icon updates.
Switched from using math to fit the icon's name to having the icon's
name fit the math, also changed the normal SMG's mag so it can also
updates properly.
2016-09-25 01:45:38 -08:00
shazbot194
47912cfd43 Small fixes for foam force weapons
-Adds a new icon for the toy tommy gun with a blue muzzle, so it doesn't
have to use the real tommy gun's icon or what is was using, nothing.
-fixes the rounding on the toy smg so it now doesn't have an invisable
magazine when loaded and displays the correct amount of ammo.
2016-09-14 20:11:38 -08:00
shazbot194
da6a80c2f4 Fixed the Riot foam icon (#5676)
* Fixed the Riot foam icon

Adds the varable riot to both normal foam darts and adds some else if
statments to give both darts and modified darts the correct icon.

* Update ammo_casings.dm

* Update ammo_casings.dm

* Update ammo_casings.dm

* Fix for single shot stechkin

changes how the stechin updates it's magazine so the single shot
magazine doesn't go invisable.

* Revert "Fix for single shot stechkin"

This reverts commit 11974996c4.

* changed description

changes the discription and moves it one line down.
2016-09-14 20:42:37 -04:00
Isaac Erwin
8986dca9d8 Now the 45 mag can use all 9 sprites 2016-09-14 14:42:18 -04:00
Isaac Erwin
3a1d07454f Okay, foxxy 2016-09-13 19:27:15 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
jughu
d9d5b41521 Yaya 2016-09-11 23:36:51 +02:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
theColdflame
4373165e21 Adds additional variants of 10mm ammunition. (#5596)
* adds variants of 10mm ammunition

you can shoot people with it

* ones which work

* third time's the charm

* adds the letter 'u'

* makes armor pen values more reasonable

* rebalanced AP
2016-09-04 09:38:39 -04:00
Crazylemon64
bc6da3082d Fixes a runtime when a null memo would be attempted to be
displayed to an admin

Null descriptions will no longer `to_chat`

KA now no longer runtimes
2016-08-31 00:27:09 -07:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Fox-McCloud
1f4f4c6cfe Crutch Refactor 2016-08-17 21:45:55 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
Chakirski
1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05:00
Crazylemon64
6ca037d9f4 Makes things more consistent 2016-08-02 11:27:28 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
TheDZD
4a818f865c Merge pull request #5159 from Fox-McCloud/bola
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
TheDZD
79d51a57da Refactors telegun, mimicgun, and tempgun 2016-07-22 16:08:17 -04:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
TheDZD
6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks
Cyborg Upgrade Additions and Refactor
2016-07-12 21:22:57 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf
Fixes pulse shot cost.
2016-07-11 20:46:22 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Fox McCloud
a8da06536c Merge pull request #4977 from FlattestGuitar/grenade-launchers
Fixes the m90 grenade launcher.
2016-07-10 15:51:08 -04:00
Mieszko Jędrzejczak
593aaee243 :^] 2016-07-10 21:43:56 +02:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Fox McCloud
88a0482d27 Merge pull request #4688 from FreeStylaLT/maintgoodies
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
2016-07-09 20:51:40 -04:00