Commit Graph
954 Commits
Author SHA1 Message Date
Fox-McCloud ea15a83fde Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage 2017-01-23 01:56:47 -05:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Alffd a6b916fc92 Makes the description generic. 2017-01-16 00:14:30 -05:00
Alffd 3fbc81cea7 Ports Enforcer handgun, rubber bullets, and new ammoboxes. 2017-01-15 21:13:22 -05:00
Fox-McCloud ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
TullyBurnalot ecaf8678ab Wand of Death now deals Burn 2017-01-07 15:15:17 +00:00
TullyBurnalot 69ff538a02 Readjusts Wand of Death for pure bugfix 2017-01-07 01:06:47 +00:00
TullyBurnalot 77371a6730 Wand of Death now gibs people 2017-01-05 22:39:38 +00:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Fox McCloudandGitHub 86eac97aa7 Merge pull request #5902 from shazbot194/master
fix for l6 description and paper hat sprites
2016-11-23 16:26:07 -05:00
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 LemonandGitHub 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 61da53cca1 create reagents proc 2016-11-06 14:37:47 -05: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
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
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
Fox McCloudandGitHub c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
jughuandGitHub 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
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
Fox-McCloud 1f4f4c6cfe Crutch Refactor 2016-08-17 21:45:55 -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
TheDZD 79d51a57da Refactors telegun, mimicgun, and tempgun 2016-07-22 16:08:17 -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
Fox-McCloud 2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Fox McCloudandGitHub 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 McCloudandGitHub 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
TullyBurnalot b79429ca8a Fixes Revolver Sound
- Spinning revolvers now produces a sound.
2016-07-08 19:20:33 +01:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD 078d7bc099 You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. 2016-07-05 19:41:44 -04:00
Fox-McCloud 19f98e860c Adds Sniper Rifle to Nuke Ops Uplink 2016-06-30 20:07:13 -04:00
monster860andFox McCloud 4bf28bdc33 Wormhole gun fixes and changes (#4792)
* Wormhole gun fixes and changes

* icon_state

* Revert lack of decay chance
2016-06-28 11:33:26 -04:00
tigercat2000andFox McCloud 732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
TheDZDandFox McCloud 051daa2e25 Fixes staff of nothing runtimes and some pathing (#4758) 2016-06-22 17:50:18 -04:00
TheDZDandFox McCloud 83f42a3e69 Mimic Gun and Gun Fixes (#4699)
* Mimic gun and gun tweaks/fixes

* Overlays
2016-06-19 13:14:33 -04:00
FreeStylaLT f7949d77e1 i have no clue what i did here but it made me make a commit so 2016-06-16 21:42:58 +03:00
FreeStylaLT 765d0ddca9 goodies only pistols, no list yet 2016-06-15 02:55:48 +03:00
TheDZD c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00