cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-15 08:52:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,872 Commits 12 Branches 2 Tags
01fd39efb62dec9535e0df41a5b05ec00ccebc85
Commit Graph

6682 Commits

Author SHA1 Message Date
ZomgPonies
01fd39efb6 Xeno gamemode bugfix 2014-03-01 02:45:52 -05:00
ZomgPonies
d0ba2cd0e3 Efficiency: Joblist 2014-03-01 00:41:18 -05:00
MrPerson
5bb608e56e Redo of jitteriness and dizziness. 
Fixes #2923

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_defines.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-28 22:21:33 -05: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
d3athrow
196ac24af2 Fix Malfunction picking an AI who doesn't have BE_MALF toggled on 2014-02-28 19:58:34 -05:00
Rob Nelson
6683a3cb0d Hopefully fix green skin not vanishing when mut is removed. Fixes Redmine #113 2014-02-28 19:57:49 -05:00
Rob Nelson
1a2adaaadb Make good/bad mutations dynamically assigned. 
Conflicts:
	code/game/dna/dna2_helpers.dm
 2014-02-28 19:56:52 -05:00
Rob Nelson
ebb188dbfd fatties no longer able to eat people instantly, takes 5 seconds, and it leaves the head of the victim in their belly. 2014-02-28 19:51:19 -05:00
Rob Nelson
f668d4f405 Hopefully fix incendiary mito. Fixes Redmine #130 2014-02-28 19:50:49 -05:00
Rob Nelson
2dd3bd53bd Deactivate hulk after collapse. 2014-02-28 19:49:39 -05:00
Rob Nelson
5a313e0c07 Rework ragin' mages ghost selection. 
Conflicts:
	compare_report.txt
 2014-02-28 19:47:11 -05:00
d3athrow
1e95f6e641 Ragin mages 
Conflicts:
	config-example/config.txt
 2014-02-28 19:45:02 -05:00
Rob Nelson
94778f937d Update blob. 
Conflicts:
	code/game/gamemodes/blob/overmind.dm
 2014-02-28 19:44:20 -05:00
Rob Nelson
24185de680 Move mining surprise shit around, start working on layout rules. 
Conflicts:
	baystation12.dme
	code/game/mining_surprise.dm
	compare_report.txt
 2014-02-28 19:29:24 -05:00
Rob Nelson
36eef31657 Compile ficks. 2014-02-28 19:18:19 -05:00
Rob Nelson
2bc90ead02 Lazarus-injected mobs are ignored by secbots and turrets. (Fixes Redmine #66) 2014-02-28 19:17:45 -05:00
Rob Nelson
f9aa992e55 Get rid of STUTTERBLOCK since it duplicates nervousness. 2014-02-28 19:11:13 -05:00
Rob Nelson
2e9c7aeefc Vastly improve display case. 2014-02-28 19:09:56 -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
Rob Nelson
59b231e657 Fix matter eating (GitHub #462) 2014-02-28 19:04:58 -05:00
Rob Nelson
5048ef693d Chameleon enhancement. (GitHub #462) 2014-02-28 19:04:39 -05:00
Rob Nelson
0bc075d16e Immolate fixes (GitHub #462) 2014-02-28 19:04:05 -05:00
ZomgPonies
f7f599b431 Xenos fixes 2014-02-28 18:54:54 -05:00
Aryn
1712fc6a42 ChangeTurf()... We meet again... 2014-02-28 17:49:25 -05:00
Aryn
52e2a3d1c6 Lighting seems to be working now. 2014-02-28 17:48:55 -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
95cbd2478b Xeno mode fixes 2014-02-28 17:37:19 -05:00
ZomgPonies
1358b11e46 ZAS overhaul 2014-02-22 23:10:37 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Ccomp5950
5664784e31 Code effeciency project: Canister icon updates 
Before:  If a canister is hooked up to a connector port it's icons were being deleted and recreated every tick.

After:  We store an update_flag that is a bitfield of the current icon and overlay states, and created a proc to check if it should change.  If not, we don't mess with icons.  Real simple.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2014-02-19 19:37:13 -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
Rob Nelson
7b7cfb605d Comm console is now NanoUI. Fixes github #489, hopefully. 
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/nano/nanoui.dm
 2014-02-15 15:33:45 -05:00
ZomgPonies
bd688b5382 Fucking byond vars 2014-02-15 13:04:57 -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
Ccomp5950
bf94d31642 RP-revconvert bugfix 
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
 2014-02-14 14:34:49 +01:00
alex-gh
9aaf0b8a5c fixed unfinished merge 2014-02-14 14:22:39 +01:00
Zuhayr
5ada6ea4cc Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective. 
Conflicts:
	code/game/machinery/cryopod.dm
 2014-02-14 14:19:35 +01:00
alex-gh
4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Zuhayr
6464f04c88 Fixes #3907 2014-02-14 14:03:13 +01:00
Zuhayr
438e48a5c1 Fixes #4306 (When a head goes into cryo storage during Rev, a random crewmember is chosen as a target instead.) 
Conflicts:
	code/game/machinery/cryopod.dm
 2014-02-14 13:56:33 +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