cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,238 Commits 26 Branches 2 Tags
b497aafb9091a5c9cc92d48cd3945ede8ac28939
Commit Graph

48 Commits

Author SHA1 Message Date
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
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
FreeStylaLT
5f74dacf6a Adds duct tape, makes everything rarer, adds a new surgery bag to replace the current one, adds regular shoes and black jumpsuits 2016-06-20 01:19:06 +03:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox-McCloud
1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
KasparoVy
679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation 
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
 2016-02-18 14:59:28 -05:00
Regen
7a51db1f2f keep the !!FUN!!, remove !!ACCIDENT!! 2015-12-29 17:58:19 +01:00
Regen
a244b36952 Adds jump to the admin message 2015-12-18 16:24:49 +01:00
Regen
5c891fab41 Makes code look neat-er 
Probably smoother as well, idk, I did what tiger asked me
 2015-12-18 16:08:37 +01:00
Regen
b26491617f Adds confirmation alert, changes some values 2015-12-17 10:14:03 +01:00
Regen
ad5256b788 Fixes and more text 2015-12-15 22:55:27 +01:00
Regen
be1a388a6e Nerfs the bag of holding + bag of holding effect 
It will now take a small amount of time before creating a singularity,
to warn people around the user, and give people time to stop themselves
in case they missclicked.
 2015-12-15 20:38:40 +01:00
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00
Fox-McCloud
b01d49d72c Borg Update: MMI and Suits 2015-09-17 06:50:24 -04:00
Markolie
aeabab7248 Welding tool refactor, in-hand updates 2015-09-16 01:27:15 +02:00
Mark van Alphen
1539a4d1e8 Merge pull request #2041 from Fox-McCloud/backpacks 
Backpack Storage Rework
 2015-09-15 06:58:44 +02:00
Fox-McCloud
1e1c667ad5 Backpack Storage Rework 2015-09-13 23:22:09 -04:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Fox-McCloud
71f6b312d8 tweak 2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
jack-fractal
a0be969870 Unifying tech levels 
Unifies tech levels between design and their products.
 2015-04-06 22:07:44 -04:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
ZomgPonies
e9288c614b Merge pull request #388 from Markolie/master 
Remove click delay, standardize mutations, attack animations, attackby() params addition
 2015-02-23 12:47:25 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Artorp
62f5006944 Ports mime backpack from /tg/station 2015-02-22 06:27:36 +01:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
Fox-McCloud
9865c61c7c Skrell Hardsuits 2015-01-29 18:31:15 -05:00
Fox-McCloud
1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -05:00
SamCroswell
7a3f19d00f Area Tag Fix, Bar Is No Longer Space 
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
 2014-12-03 19:41:33 -05:00
SamCroswell
53cb7776b1 Map Changes, Duffelbag Fix 
- Re-did admin room clothing storage
- Added the hammers to the weapon storage
- Replaced the unloaded mechs with loaded mechs
- Added Misc mecha equiptment next to the mechs in crates
- Replaced the Emergency NanoMed on the Syndi Ship with a SyndiMed. Same
thing, different access requirements, different icon.
- Replaced the vending machines with syndicate vending machines on the
Nukeops starting area. These require no access to use, and vend EVIL
items.
- Replaced the Syndicate DS mechs with loaded versions, as they were
unloaded.
- Removed the nonfunctional radio broadcaster on the Ruskie DJ Station.

- Fixed the captain duffelbag duplicate define.
 2014-11-22 17:31:56 -05:00
SamCroswell
7c2f2d09d2 Adds Duffelbag, Fixes Inhand for Hammers 2014-11-20 20:04:41 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
097cc95bd2 R&D Nerfs 2014-10-25 20:54:25 -04:00
Necaladun
cdb0a47d0b Fix satchels 
I herped a derp and broke satchels
 2014-04-16 16:26:38 +09:30
Necaladun
c199a41b21 item and map 
Custom items for mark and the map uploaded
 2014-04-13 15:09:27 +09:30
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
johnsonmt88@gmail.com
35cb1b2530 Removed storage.dm from defines and moved the storage item defines to the location of their respective procs. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5252 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-02 19:00:33 +00:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
Asanadas
e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
Cael_Aislinn
eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-28 19:57:11 +10:00
johnsonmt88@gmail.com
d36387607f More file structure stuff. 
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.

**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-08-26 01:20:02 +00:00