cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,067 Commits 26 Branches 2 Tags
bb2ce97fd836d7d623dbbf960abeafcba421eaad
Commit Graph

188 Commits

Author SHA1 Message Date
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie
8a63f79e54 Sparks will now disappear properly 2014-12-22 00:15:58 +01:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
Markolie
e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
SamCroswell
d23578525d NeinHaus' warning stripe icons 
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
 2014-12-06 11:49:58 -05:00
SamCroswell
07435d52d1 Revert "NeinHaus' warning stripe icons" 
This reverts commit a6a1ac9dc4.
 2014-12-06 11:49:45 -05:00
SamCroswell
a6a1ac9dc4 NeinHaus' warning stripe icons 
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
 2014-12-06 11:48:20 -05:00
SamCroswell
2d1f82f94e VERY Minor Map Fixes, Bug Fixes 
The plating in the maintenance bar now has the correct icon when given
tiles.

Borgs can no longer add their modules to carts.

The hand teleporter now recharges properly again.
 2014-12-05 19:08:36 -05:00
Markolie
7e98ba2abe Poster ripping fix, allow access to air alarms when set to auto 2014-12-01 23:11:10 +01:00
Fox-McCloud
a8bda9d958 Merge pull request #438 from Bram961/master 
Pirate outfit
 2014-11-07 10:40:46 -05:00
Bram961
1e8681cc11 Pirate outfit 
A new outfit looking like the one a pirate captain would wear
 2014-10-24 17:16:42 +02:00
SamCroswell
a860241f96 Rigged up unused warning stripe decals, we no longer require specific turfs for warning stripes. 2014-08-01 09:57:57 -04:00
SamCroswell
94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
ZomgPonies
14b7c17b6a Spider nerf 2014-07-22 15:11:03 -04:00
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
Hubblenaut
b9be3e6ed7 Stops buckled mobs from slipping (for now) 
Conflicts:
	code/game/turfs/simulated.dm
 2014-07-13 06:48:17 -04:00
ZomgPonies
9b1247a21c Fixes blood on wheelchair 2014-07-13 06:47:05 -04:00
mwerezak
b64441cb26 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-06-22 02:03:42 -04:00
Walter0o
898d4f7af5 alien weed and node fixes bonanza 
couple of things :
1.) alien weeds spawning with a node param works totally fine ingame ( AKA vomited by an alium ),
but when placed on map in DM they will trigger nullpointer errors for every single weed placed.
this seems to went undetected simply because there are no weeds on the map at startup,
ever since your asteroid abandoned outpost got replaced with that vox trading station.

2.) it took me a moment to understand what node/Destroy() is supposed to do.
it looped through its list of spawned weeds and nulls only its own linked_node var.
that could have been done by src.linked_node = null, but i dont think that is the intention of the loop.
for safe GCing the linked_node var of all weeds that got spawned by this node need to be nulled, not only its own.

3.) to be safe, the turf/space check should happen before any list operations are done, also replaced del() with qdel() here.

4.) the linked_node check of weeds/proc/Life() should be one of the first things to happen, which saves a lot of checks.

5.) the layer of weeds being default 3 was quite annoying as the weeds made it hard to click all kinds of layer 3 items and objects.
fixed for weeds, nodes will still be 3 to properly show above things like AI holopads.

6.) i took the liberty of changing the node/node param to node/N ,
rename the spawns list to connected_weeds and move weeds/Destroy() up for better readability.
 2014-05-28 08:56:58 -04:00
ZomgPonies
3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
cloroxygen
c8b1fd08de 21 viro symptoms 
Im an idiot that cant use github edition

Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
	code/modules/virus2/effect.dm
 2014-05-17 19:17:35 -04:00
alex-gh
4a7e113cf5 Pyro anomaly tweaks 
Pyro anomaly arrives much later after announcement, making it easier to disable.
Pyro anomaly now produces more plasma.
 2014-05-13 17:20:28 +02:00
Zuhayr
c599199a8e Fixes #4911 2014-05-12 03:11:15 -04:00
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
ESwordTheCat
3c6966526c Object pool the sparks. 
Conflicts:
	code/game/objects/effects/effect_system.dm
 2014-04-28 20:40:38 -04:00
d3athrow
68012f5017 Fixed a gamebreaking bug 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/life.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-03-22 06:22:55 -04:00
Heredth
5d77dcecaa Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up 
Conflicts:
	code/game/machinery/vending.dm
 2014-03-11 06:11:12 -04:00
ZomgPonies
8ee94ad622 alien weeds also 2014-03-06 22:23:19 -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
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
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
Rob Nelson
559700a58b Added a bunch of new goon powers. 
Conflicts:
	code/modules/mob/living/carbon/human/emote.dm
 2014-01-26 14:48:33 -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
57dc0ddd50 Implement toxic farts. 
Conflicts:
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/human/human_defines.dm
 2014-01-21 14:35:15 -05:00
d3athrow
266c80a764 sanity checking to resolve runtimes 2014-01-19 23:59:26 -05:00
ZomgPonies
11f32fba24 Nerfed amount of spiders 2014-01-19 21:01:07 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
SamCroswell
d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
ZomgPonies
acb3f37c1b vg's likely superior bot code. 2014-01-13 04:24:16 -05:00
Rob Nelson
d3c4f0a5e7 New posters from BS12, plus custom poster-loading system that allows dynamic loading. 
Conflicts:
	baystation12.dme
	code/game/objects/effects/decals/contraband.dm
	html/changelog.html
	icons/obj/contraband.dmi
 2014-01-12 03:45:32 -05:00
ZomgPonies
24dceac4ef Compile fix 2014-01-11 21:07:13 -05:00
Rob Nelson
92722efe15 Fixed #395: Cut down posters can't be replaced. 
Conflicts:
	code/game/objects/effects/decals/contraband.dm
 2014-01-11 20:46:29 -05:00
Rob Nelson
5a061d770f Fix #381 - Poster duping 2014-01-10 02:04:20 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 
Conflicts:
	code/modules/mining/mine_turfs.dm
 2014-01-09 20:56:38 -05:00
Mloc-Argent
4e7feaf624 More elegant solution to dirt getting in the way. 
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/decals/Cleanable/misc.dm
 2014-01-08 18:40:00 -05:00