Commit Graph

212 Commits

Author SHA1 Message Date
ZomgPonies 8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
ZomgPonies f27ccb6f4d Owlman/Griffin toys/posters/barsign 2015-02-27 13:24:45 -05:00
Markolie 20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Tigercat2000 4345506c9c Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob
Conflicts:
	code/modules/admin/admin_verbs.dm
2015-02-20 03:52:58 +01:00
DZD d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies 4be5819122 Merge pull request #339 from Fox-McCloud/Explosives
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
Fox-McCloud 1812a36113 Chem Boom Nerf 2015-02-18 17:13:58 -05:00
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
Tigercat2000 d23d8af778 Port of freeze mob verb from NSS Pheonix 2015-02-17 18:04:31 +01:00
Markolie d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
ZomgPonies 239c996b1c Moved grenade logging from adminlog to attacklog 2015-02-12 01:58:34 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie 64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Markolie 86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Markolie 956f2ba703 Event overhaul from Bay, atmos fixes 2015-01-21 23:05:59 +01:00
DZD c769177a73 Wizard Bugfixes
- Prevents the Mutate spell from being used on z-level 2, so you can't
refund the spell while it's in use for permahulk.
- Ports in repulse spell from /tg/, it pushes away movable objects and
mobs away from the wizards. Mobs within 5 tiles will be stunned for 2
seconds, and mobs in the same tile as the wizard are stunned for 5 and
take minor damage.
- Fixes forcefields and forcewall spell by porting over
/obj/effects/forcefields.dm from /tg/. (This also fixes the mime wall,
god help us all)
- Mime forcefield nerfed to a 5 second duartion, retains 30 second
cooldown. (Yeah, let's not have those last 30 seconds.)
2015-01-17 12:12:28 -05:00
Markolie 042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
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