cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

1776 Commits

Author SHA1 Message Date
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks 
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
 2014-05-03 18:35:10 -04:00
ESwordTheCat
ebfcc9be79 Object pool for beam projectile, minor changes to object pool. 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:33:06 -04:00
RavingManiac
9bfd6f56ba Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts. 
Conflicts:
	maps/tgstation2.dmm
 2014-04-28 18:47:15 -04:00
Giacomand
9d27cb5d76 Fixes a typo. 2014-04-26 17:28:10 -04:00
Giacomand
0232d945f4 Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop. 
Segmented the transit tube code into its own folder and code files, for each part of the tube.

Conflicts:
	baystation12.dme
	code/game/objects/structures/transit_tubes.dm
 2014-04-26 17:27:43 -04:00
ZomgPonies
c5c2f52500 Fixed some bugged intents 2014-04-22 11:02:11 -04:00
RavingManiac
850236a137 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1. 
Fitness room rearranged to make more sense, with glass around pool.

Conflicts:
	maps/tgstation2.dmm
 2014-04-22 09:24:46 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
ESwordTheCat
28b8001188 Implement it to grille. 
Conflicts:
	code/game/objects/structures/grille.dm
 2014-04-19 20:00:15 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
ESwordTheCat
907971e8ab Grille complete pooling. 2014-04-19 19:42:55 -04:00
ESwordTheCat
424df5eaf7 We object pool grille now. 2014-04-19 19:42:42 -04:00
ESwordTheCat
dde219a581 Object pooling immature implementation. 
Conflicts:
	code/__HELPERS/experimental.dm
 2014-04-19 19:42:04 -04:00
Rob Nelson
9227481a8a Standardize windows. 
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-04-19 19:36:33 -04:00
Jarcolr
abdcf82123 Kicking a grille does 2 less damage; fix for #4557 
It will now take 10 hits to destroy it without using a weapon or tools.

Take that,metagamers!
 2014-04-19 16:06:09 -04:00
Jarcolr
b5056c5441 Cannot wash your missing hands anymore 
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
Conflicts:
	code/game/objects/structures/watercloset.dm
 2014-04-19 16:01:51 -04:00
Jarcolr
935576f5c4 Can no longer use fire extinguisher closet without hands 
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
 2014-04-19 15:53:33 -04:00
RavingManiac
f80d1e702b Missing files added. 2014-04-19 15:51:27 -04:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Aryn
072bdcde60 I think I fixed everything it is possible to stuff a light source into. 
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
 2014-03-21 09:58:54 -04:00
Kzd1
2ac635aacf -fixed pulse destroyer projectiles not being able to destroy girders 2014-03-12 19:22:06 -04:00
ZomgPonies
c751ee454c Small fixes 2014-03-06 22:45:38 -05:00
ZomgPonies
7ad775b0a2 Statue fixes 2014-03-06 19:59:07 -05:00
ZomgPonies
d15a9c1b99 Museum first iteration 2014-03-06 16:33:41 -05:00
Rob Nelson
2e9c7aeefc Vastly improve display case. 2014-02-28 19:09:56 -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
SamCroswell
be3c95a9ff Changes 'n shit 2014-02-07 18:43:48 -05:00
SamCroswell
bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -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
7a99402138 Compile fix 2014-01-31 03:19:42 -05:00
Razharas
c72e625e53 Returned to the forces of light thanks to gia 
No more text paths, only normal paths
 2014-01-31 02:56:40 -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
Razharas
17151cd7b2 Some recipes and addable parts 
Indeed
 2014-01-31 02:51:57 -05:00
Razharas
58cb6a147a Return to the text paths 
Yes byond doesnt let me use normal paths as association for numbers
 2014-01-31 02:51:36 -05: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
ZomgPonies
2e5fc8a4fc Revert "Display cases now constructable." 
This reverts commit 3e210aa75c.
 2014-01-25 12:29:29 -05:00
Rob Nelson
3e210aa75c Display cases now constructable. 
* Make machine frame
* Add glass (do not wire)
* Add airlock controller board (set perms first)
* Screwdriver

Disassemble by crowbarring when unlocked or broken.

Conflicts:
	get_dmi_header.bat
	html/changelog.html
	icons/obj/stock_parts.dmi
 2014-01-24 21:42:33 -05:00
Rob Nelson
dd7f48c470 More typo. 2014-01-24 12:24:35 -05:00
Rob Nelson
e3a2a9238d Fix typo before someone notices. 2014-01-24 12:24:14 -05:00
ZomgPonies
47e8c640a2 New display case code 2014-01-24 12:23:26 -05:00
Ergovisavi
7ad68dd693 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash 
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2014-01-23 23:31:36 -05:00
John Smith
7a10f3c626 Black Baseball Caps [FIXED] 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-01-22 11:07:39 -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
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Razharas
8f71ea55e3 Added tools and time handling 
Well yeah
 2014-01-21 21:05:50 -05:00
Razharas
56e56b31a6 Implemented crude crafting 
Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-21 21:05:42 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00