cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,545 Commits 26 Branches 2 Tags
a9245dceeef6cf58c8b45bd1d0b89ba5eeec4e4d
Commit Graph

1626 Commits

Author SHA1 Message Date
Rob Nelson
341d210c99 Fix some issues with the radio, like talking on common when calling for command. 2014-01-24 12:04:52 -05:00
Rob Nelson
d01ef41eac Radio code in say.dm cleaned up, will use all possible radios when sending a message. 
Conflicts:
	code/modules/mob/living/say.dm
 2014-01-23 23:48:46 -05:00
ZomgPonies
f1c80be06f Merge pull request #127 from SamCroswell/master 
Tweaks 'n shit
 2014-01-23 20:34:50 -08:00
SamCroswell
d4890fb2f5 Additional Drug Names 2014-01-23 19:26:32 -05:00
SamCroswell
f59fa5474e Contraband Crate Changes, Minor Drug Tweaks 
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
 2014-01-23 18:01:41 -05:00
Cluwnes Honk
6478e2e1d7 silent is broken as fuck 
Removes the message that checks if a mob is silent; silent is just plain broken.
 2014-01-23 10:34:41 -05:00
Cluwnes Honk
f54a35db72 Prevents mimes from using the megaphone. 
if(user.silent) didn't work. This is the next best thing.
 2014-01-23 10:34:03 -05:00
SamCroswell
a3a883444c Last minute tweaks 2014-01-22 23:12:50 -05:00
SamCroswell
fc4877b301 Added a few more drug names 2014-01-22 22:55:19 -05:00
SamCroswell
86ad8a5a17 Drugs/Minor CentComm Updates 2014-01-22 22:26:01 -05:00
Jesus Hussein Chris
95f7280781 Generic attack sounds for all melee weapons 
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
 2014-01-22 10:15:43 -05:00
Rob Nelson
7892eeb7cc Standardize LASER, NOCLONE, and HUSK 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:59:53 -05:00
Rob Nelson
d49e6d3bf4 Standardize CLUMSY 
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2014-01-21 22:49:22 -05:00
Rob Nelson
22a2df1115 Standardize HULK. 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
 2014-01-21 22:45:40 -05:00
Rob Nelson
dd8c8c12ab Standardize XRAY. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:37:37 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
bb853093c1 Intercom runtime fix 2014-01-20 04:05:29 -05:00
Rob Nelson
a04324baef Fix more by-ref issues in DNA 
Conflicts:
	code/game/machinery/hydroponics.dm
 2014-01-20 01:54:33 -05:00
Rob Nelson
c349f761d9 Fixes for DNA2, again, 2014-01-20 01:50:56 -05:00
Rob Nelson
20bc568131 Fix DNA injectors breaking shit. 
Conflicts:
	code/game/dna/dna2_helpers.dm
 2014-01-20 01:49:49 -05:00
Rob Nelson
6fe47cfc51 Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT 
Conflicts:
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/weapons/dna_injector.dm
 2014-01-20 01:48:57 -05:00
Rob Nelson
fd6cc3e458 HA HA NEW GENE HANDLING 
Also fixed block injector crash.

Conflicts:
	code/game/dna.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
 2014-01-20 01:41:03 -05:00
Rob Nelson
dc60cc1726 DNA modifiers work now. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
 2014-01-20 00:54:46 -05:00
Rob Nelson
4a8ca0a7d4 Now tested up to character join. 2014-01-20 00:44:10 -05:00
Rob Nelson
db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA 
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
 2014-01-20 00:43:19 -05:00
Pete Goodfellow
331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
 2014-01-19 21:25:47 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Glloyd
085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 
Conflicts:
	icons/mob/back.dmi
 2014-01-19 05:32:34 -05:00
Aranclanos
eb76256f04 Adds the captain's medal to the medal's lockbox. 
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
 2014-01-16 21:55:00 -05:00
ZomgPonies
b80552169c Stupid type 2014-01-15 13:13:13 -05:00
Mark Aherne (Faerdan)
c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
 2014-01-15 01:53:51 -05:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/. 
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
 2014-01-12 22:37:55 -05:00
Ccomp5950
f217cae518 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
 2014-01-11 21:50:53 -05:00
JJRcop
3d34a12066 Minor nuke toy edit 
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
 2014-01-11 12:45:45 -05:00
JJRcop
24e29deeaf Adds "surround" arg to playsound, which enables 3D sound 
Defaulted to on
Also changes the toy nuke to use it

Conflicts:
	code/game/sound.dm
 2014-01-11 12:45:32 -05:00
JJRcop
7b678241e4 Adds a visible_message to the nuke toy when it is used 2014-01-11 12:40:53 -05:00
JJRcop
e235bc94e6 Adds new nuke toy, plays nuke sound when attack_self'd 
Cooldown of 5 minutes

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/objects/items/toys.dm
	icons/obj/toy.dmi
 2014-01-11 12:40:19 -05:00
Rob Nelson
9fdde1eec7 Fix #388: Incorrect C4 timing checks. 
Conflicts:
	code/game/objects/items/weapons/explosives.dm
 2014-01-10 01:59:07 -05:00
Rob Nelson
da6b615e44 Adjacent didn't work, back to using get_dist. 2014-01-10 01:56:45 -05:00
SkyMarshal
d101e5c111 RCDs no longer create plating with air on it. 
Fixes #3545
 2014-01-09 20:26:28 -05:00
Rob Nelson
9bdae9ff75 Fix fire extinguishers bluespacing their contents afar when dumping. 
Also use Adjacent so we can't dump through windows.

Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
 2014-01-09 05:09:51 -05:00
Cheridan
2b87fcf581 Upgradeable Laser Pointers! 
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!

Conflicts:
	code/game/objects/items/devices/laserpointer.dm
 2014-01-09 04:20:08 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
 2014-01-08 07:14:16 -05:00
Ccomp5950
a6b70bc8b4 PDA NanoUI Optimizations. 
Since we no longer have to send data on first UI view we can remove those
checks and only look at the data we need to send when we need to send it.

Also fixed a couple of the links on the status display function.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
 2014-01-08 05:48:49 -05:00
Mark Aherne (Faerdan)
5d04a41151 NanoUI updates. 
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
 2014-01-05 23:28:52 -05:00
Rob Nelson
68fd13b90c Fix fire extinguisher not being fillable with the top off. 2014-01-05 22:35:30 -05:00
d3athrow
752a61087a Adds an open button next to comms sayers name that opens the nearest airlock to them maximum of 3 tiles away. does not work for people not on camera or using something that makes them untrackable(digital camo, agent card, ninja mask, etc) 2014-01-05 19:21:35 -05:00
ZomgPonies
aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
Mark Aherne (Faerdan)
0a29d579c6 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs 
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	nano/js/libraries/2-jsviews.js
	nano/templates/chem_dispenser.tmpl
	nano/templates/telescience_console.tmpl
 2014-01-05 00:48:28 -05:00
Nanai
69e713c04a Surgery Update 
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.

Conflicts:
	code/modules/surgery/ribcage.dm
 2014-01-04 15:44:23 -05:00