cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,961 Commits 26 Branches 2 Tags
b97434054fec00bc0df5329f7336425f9bfa76bd
Commit Graph

1670 Commits

Author SHA1 Message Date
Jeremy Liberman
99a588631a Wearing masks or straight jackets blocks chewing on your wrists 2014-03-05 22:27:40 -05:00
Jeremy Liberman
55ba32d02d Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
 2014-03-05 22:20:44 -05:00
d3athrow
72f985f3ea Missed a reference for radio devices 2014-03-05 20:37:40 -05:00
ZomgPonies
16ea3bde04 Compile fixes 2014-03-05 20:37:02 -05:00
d3athrow
dc50b47971 More Destroy stuff 2014-03-05 20:28:38 -05:00
d3athrow
4f168d8caf qdel and Destroy() improvements, now done through objects/items/devices 2014-03-05 20:28:17 -05:00
d3athrow
19d339c45d Furthur optimizing qdel and Destroy for obj/effect 
Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
 2014-03-05 20:26:40 -05:00
Ccomp5950
cd201dc3a5 NanoUI Optimizations. 
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

Some other things that I just can't remember right now.

Conflicts:
	code/defines/obj.dm
 2014-03-04 00:37:44 -05:00
ZomgPonies
ab707a9c3c Custom guitar item for scrat 2014-03-03 23:02:12 -05:00
alex-gh
c0d4c2c8f7 re-added death alarm implanters 2014-03-02 09:17:49 +01:00
ZomgPonies
207959cc7d crash fix 2014-02-28 21:31:59 -05:00
Ccomp5950
09bfeb737b Runtime fix: I have no UI, and I must close it. 
runtime error: Cannot execute null.close().
proc name: Topic (/obj/item/device/pda/Topic)
  source file: PDA.dm,485
  usr: Garry Myers (/mob/living/carbon/human)
  src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
  call stack:
PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
 2014-02-28 21:03:05 -05:00
ZomgPonies
7a87ee111f Compile fixes 2014-02-28 19:09:24 -05:00
Rob Nelson
c7774b3a41 Fully fixed compressed-matter implanter. Tested. (GitHub #526) 
Conflicts:
	code/game/objects/items/weapons/implants/implanter.dm
 2014-02-28 19:06:39 -05:00
Aryn
5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on 
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
 2014-02-28 17:47:50 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Lokiamis
544c39f7c2 salvage 
Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-02-16 10:38:52 -05:00
Incoming
917370a608 Jay Owen demands that this pull be merged. 
Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi
 2014-02-16 05:42:55 -05:00
Rob Nelson
71c07e208a Improved creature AI and random mob spawning in caves. 
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
 2014-02-16 04:40:18 -05:00
Rob Nelson
6ad3ca77f1 New stuff for mining 
Conflicts:
	code/game/mining_surprise.dm
	code/game/objects/structures/wizmobile.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/minerals.dm
	compare_report_tg.txt
	icons/obj/mining.dmi
	icons/turf/walls.dmi
 2014-02-16 03:54:39 -05:00
ZomgPonies
60abc446db Merge pull request #158 from SamCroswell/master 
/TG/ Card Port
 2014-02-15 12:39:49 -05:00
ZomgPonies
7a54bb3b24 Merge pull request #159 from alex-gh/fireex_nerf 
Nerfed firing items from fire extinguishers, they now do double the dama...
 2014-02-15 12:39:41 -05:00
alex-gh
9aaf0b8a5c fixed unfinished merge 2014-02-14 14:22:39 +01:00
alex-gh
4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Zuhayr
85b59532fe using a welder with already damaged eyes no longer causes you to go blind 
Conflicts:
	code/game/objects/items/weapons/tools.dm
 2014-02-14 13:48:46 +01:00
alex-gh
0f57ef70ca Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally 2014-02-14 13:22:34 +01:00
Ccomp5950
ca75160d6a People in lobby won't see PDA messages. 2014-02-14 11:54:32 +01:00
SamCroswell
3634ff942b /TG/ Cards Ported, new card deck added 2014-02-11 23:22:30 -05:00
Ccomp5950
4ae2cd974b Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-11 03:00:04 -05:00
SamCroswell
be3c95a9ff Changes 'n shit 2014-02-07 18:43:48 -05:00
Rob Nelson
00f830cc2a Remove radio debugging. 2014-02-05 22:51:03 -05:00
RKF45
c69ddf76ec Reintroducing the dough-based cooking system. 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-02-01 19:22:22 -05:00
ZomgPonies
05149946d6 Remove borken RPD 2014-02-01 04:30:17 -05:00
Razharas
5c8d9ede3b Added chem handling and IED recipe 
Uh oh

Conflicts:
	code/game/atoms.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-31 02:56:27 -05:00
ZomgPonies
88ee7313b5 Merge pull request #139 from SamCroswell/master 
Additional Select Equiptment Option, More Areas
 2014-01-30 23:46:47 -08:00
Rob Nelson
c3b021e246 Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode. 
And holy shit it's fast

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/pipes.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/rechargestation.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mining/mine_turfs.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/cable.dm
	html/changelog.html
 2014-01-29 23:45:21 -05:00
SamCroswell
12ffdb84bd PDA icon fixes, various fixes to select equipt 2014-01-29 17:24:51 -05:00
ZomgPonies
6dfa08040c Merge pull request #131 from SamCroswell/master 
More C4 suicide phrases. For no Raisin.
 2014-01-28 20:15:26 -08:00
Zuhayr
8c5ad54e0f Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR. 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/admin/verbs/vox_raiders.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/carbon/species.dm
 2014-01-28 15:30:20 -05:00
SamCroswell
beea722e60 More C4 suicide phrases. For no Raisin. 2014-01-26 14:45:16 -05:00
ZomgPonies
f084d49d24 Compile fixes 2014-01-25 12:40:47 -05:00
Rob Nelson
22f6bb90be Add additional extinguisher logging, transfer logging framework. 
Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
 2014-01-25 12:29:21 -05:00
d3athrow
58275e6ddc Fuck you emisune 2014-01-25 12:27:07 -05:00
d3athrow
253035f935 Fixes #452, people who are silenced for whatever reason or miming can't use the megaphone 2014-01-25 12:26:54 -05:00
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