Commit Graph

368 Commits

Author SHA1 Message Date
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti
aa454c0e1d Adds Farm PoI
Also fixes various bugs with surface tiles, hopefully.
Adds some documentation to the map file system.
Adds a new 'plane' map, ideal for testing PoIs by loading them manually.
Makes space heaters glow orange.
Adds a new grille type for fancy surface windows.
Adds self planting hydro trays/dirts if a seed is on top of them when the map is loaded.
2017-09-26 01:44:06 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
PrismaticGynoid
2a866c4924 Fixes for nettles (#3854)
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.

* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
2017-09-17 23:45:29 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima
61e23886cb Adds sounds for chopping wood. 2017-09-08 17:15:48 -04:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Leshana
cae4b3f12c A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-11 23:48:17 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Yoshax
93db79b99e Removes a stray world log 2017-05-03 14:29:43 +01:00
Datraen
3d442044d1 Adds Gene Targetting mode to Floral Somatoray
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.

No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Arokha Sieyes
06ab089bb2 Eris Vending Machine Sprites 2017-04-23 17:56:43 -04:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Leshana
f2956464b8 Replace direct access of lighting overlays with T.get_lumcount() 2017-04-12 19:11:53 -04:00
Leshana
45058136e2 Replace opacity = X with set_opacity(X) so that the lighting system can update propertly. 2017-04-11 22:36:48 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
Arokha Sieyes
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
bba014acfa More plant things 2017-02-20 18:32:18 -06:00
Anewbe
09e7d5aef9 Buffs Space Vines 2017-02-20 14:22:18 -06:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
9cbee4baf4 Ports taste 2017-01-16 17:07:41 -06:00
Cameron653
8cef69e9df Makes mushroom sprites show up correctly when harvested (#788) 2016-12-30 23:06:57 -05:00
killer653
07b2db850f Fixes invisible size shrooms 2016-12-13 21:14:02 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
killer653
fa5df25a60 Adds mega/shrink shrooms to vendors 2016-12-04 21:07:53 -05:00
Cameron653
8a12de6ed2 Create seed_pacets_vr.dm 2016-12-04 20:01:31 -05:00
Yoshax
31fb2944d6 Changelog 2016-11-19 14:30:46 +00:00
Yoshax
737205d945 Adds cryogenic stasis to hydroponics trays 2016-11-19 02:26:39 +00:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
killer653
d1afae6d06 Polaris Sync & bugfix
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
2016-08-17 22:02:05 -04:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
Yoshax
3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION
Properly alphabetizes lavender in the vending machines.
2016-07-13 17:10:10 +01:00
Serithi
8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00