cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,404 Commits 26 Branches 2 Tags
331cf1df95ea5faba0d09be78f07da69b92744b0
Commit Graph

1601 Commits

Author SHA1 Message Date
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
ZomgPonies
ca011ee962 NanoUI update 2014-01-04 03:50:54 -05:00
ZomgPonies
6827a12afe Fire extinguishers can now spray any reagent desired. 2014-01-03 21:22:53 -05:00
DJSnapshot
8f9e08150e mecha fixes 2014-01-02 20:51:47 +01:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
6bae66a53a Small bugfixes 2013-12-29 17:04:18 -05:00
ZomgPonies
04542065e5 Tons of new Mafia-theme stuff 2013-12-29 14:30:29 -05:00
ZomgPonies
e75a51026d PDA fix 2013-12-29 14:00:36 -05:00
ZomgPonies
4c6e8fdbd4 NanoUI PDA optimizations 2013-12-29 12:32:51 -05:00
ZomgPonies
80b76cf076 Fix PDA messenger bug 2013-12-28 08:47:58 -05:00
ZomgPonies
1d47723912 uplink fix 2013-12-28 07:54:04 -05:00
ZomgPonies
dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies
9a8d2ff8b8 Removedd console spam 2013-12-23 02:54:20 -05:00
ZomgPonies
5df339188e Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2013-12-23 02:49:59 -05:00
ZomgPonies
4def7c9a65 Added RPD 2013-12-23 02:49:52 -05:00
alex-gh
6e0f7ac0be Made explosive implants use a random phrase instead of preset one 2013-12-23 08:01:49 +01:00
ZomgPonies
2573088771 PDA NanoUI 2013-12-22 16:03:21 -05:00
ZomgPonies
5661d24dc7 Updated ashtray code! 2013-12-22 06:36:27 -05:00
ZomgPonies
5ce256b73c Organ/Surgery Overhaul Part 1 2013-12-19 07:25:55 -05:00
ZomgPonies
62b0b49659 Brain Borer Overhaul 2013-12-19 03:32:19 -05:00
alex-gh
329c8ffb7f penlights can go on your ear now 2013-12-19 02:20:50 +01:00
ZomgPonies
7658fe255d Vamp update 5 2013-12-16 02:37:07 -05:00
ZomgPonies
85e75ca052 Walking on glass shard fix 2013-12-14 20:02:32 -05:00
ZomgPonies
12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
alex-gh
270d5c24a7 Placing tiles on a space turfs no longer results in unsimulated platings 2013-12-11 00:40:10 +01:00