Commit Graph

7732 Commits

Author SHA1 Message Date
Verkister
762bfa7649 Longpup mobs!
-plain and just hostile version
-recruitable follower pet version that starts hostile but has a 50% chance of taming and befriending on petting.
-same as above but with a collar
-guard puppy version that comes tame by default, runs after criminals, and has the 50% chance of befriending and following.
2017-06-09 18:34:03 +03:00
Arokha Sieyes
f7c3ab5a8c Merge pull request #1626 from VOREStation/aro-nifsoft
Nanite Implant Framework
2017-06-06 21:55:05 -04:00
Arokha Sieyes
5ea2e30234 Leshana-suggested changes 2017-06-06 21:11:25 -04:00
Arokha Sieyes
08e7703e4f Finishing Up NIFs
Squashed commit:

[4b18ca1] Finishing up NIFs

[e4adb4a] Tons more NIF work

All the implants are done!
2017-06-06 19:34:41 -04:00
Arokha Sieyes
de49e2659e Merge pull request #1627 from Screemonster/chimeratweaks
chimera bugfixes and tweaks
2017-06-06 18:54:06 -04:00
Screemonster
c45ddb6d27 further fixes 2017-06-06 21:04:51 +01:00
Arokha Sieyes
b7e52cefcc Merge pull request #1611 from Yoshax/traits
Adds a set of new traits regarding susceptibility to electric shocks
2017-06-06 10:53:28 -04:00
Screemonster
26e817981a chimera bugfixes and tweaks 2017-06-06 12:23:03 +01:00
Arokha Sieyes
58ee6891f2 Additional Work on NIFs
Squashed commits:

[9563a9a] All the stuff I forgot to commit
2017-06-06 01:00:46 -04:00
Arokha Sieyes
50accd426c Initial NIF Commit 2017-06-06 01:00:42 -04:00
Yoshax
7e253921d4 Fixes the stuff 2017-06-04 17:49:25 +01:00
PontifexMinimus
a9851ace2d Update giant_spider.dm
With the normal spider toxin. Because right now, every bite causes 7 units pumped into a person. That brings it to 21 units with only three bites, enough to knock down a person for +20 minutes. Which won't fucking do.
2017-06-04 17:26:43 +02:00
Yoshax
7a9a129592 Adds a set of new traits regarding susceptibility to electric shocks 2017-06-02 19:30:33 +01:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Neerti
1f70e65160 Merge pull request #3484 from VOREStation/aro-pol-footblood
Please let the blood go away
2017-05-31 10:49:11 -04:00
Arokha Sieyes
64ff8bed08 Please let the blood go away
You can't qdel lists.
2017-05-30 16:27:04 -04:00
Arokha Sieyes
67dce8524b Please let the blood go away
You can't qdel lists.
2017-05-30 16:25:55 -04:00
Arokha Sieyes
271084e22c Merge pull request #1586 from VOREStation/aro-SPECIES
Trait Tweaks
2017-05-30 11:48:58 -04:00
Arokha Sieyes
684f570d0d Trait Tweaks
Adds blood color as a custom species setting
Adds photoresistant trait
Changes haste and slowdown traits to be taj and tesh speeds
2017-05-30 11:35:40 -04:00
Anewbe
a412b5063b Merge pull request #3423 from Belsima/ftm
Lets biological females have facial hair.
2017-05-29 18:31:18 -05:00
Arokha Sieyes
5ccb939531 Merge pull request #1583 from VOREStation/aro-SPECIES
Custom Species Trait System
2017-05-29 17:49:45 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
killer653
a52bac9f1c Makes it so mice can't eat people.
http://i.imgur.com/Huc8Ikk.jpg
It was causing a lot of bugs
2017-05-28 18:48:20 -04:00
Arokha Sieyes
93770b3be7 Changes emergency box to have goggles, mask, and O2 tank in it.
Just goggles for synths.
2017-05-27 03:10:43 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana
1b0474d57a Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-25 15:37:43 -04:00
Leshana
c3df48f949 Fixes Runtime in atmosphere_alarm.dm,24: list index out of bounds
proc name: on alarm change (/datum/alarm_handler/atmosphere/on_alarm_change)
2017-05-23 01:14:55 -04:00
Leshana
4197a6e60d Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-23 01:14:55 -04:00
Anewbe
23f70f0b3a FBPs should cook again. 2017-05-22 22:24:31 -05:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Arokha Sieyes
2ea6c0bc17 Merge pull request #1490 from VOREStation/aro-sanom
Fix 2 SA problems
2017-05-20 15:17:35 -04:00
Arokha Sieyes
5bc3d7ba22 Merge pull request #1491 from Yoshax/lang
Fixes an issue where a non-existent language was existing + some normalisation
2017-05-20 15:14:30 -04:00
Yoshax
3d63880041 Adds defines cause who wants problems 2017-05-20 18:11:20 +01:00
Yoshax
b188fae46b Fixes an issue where a non-existent language was existing + some normalisation 2017-05-20 17:52:24 +01:00
Arokha Sieyes
19e9b351ac Fix 2 SA problems
Missing the Animal Nom verb when playing as an animal, and the ID doesn't get read if you have one.
2017-05-20 03:10:39 -04:00
Arokha Sieyes
47303fe7d1 Adds Wahs
Dem red panders.
2017-05-19 17:27:02 -04:00
Anewbe
eab2a410ba Merge pull request #3453 from Eimras/Diona-shock-fix
Diona don't get shocked working on electrical things
2017-05-17 17:42:01 -05:00
Sarmie
84a7f64010 Re-branch to fix GIT stuff 2017-05-17 17:17:45 -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
d5eb86d810 Transfer talking and visible messages upwards thru open space.
Mobs speaking and doing things that emit visible messages will now be seen on floors above, including the icons.
2017-05-15 20:37:07 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
Sarmie
3ca8bc1375 Disfigure Check Fix 2017-05-12 20:42:36 -04:00
Sarmie
78880cd18e Disfigure check 2017-05-11 20:24:21 -04:00
Sarmie
06d5d0b189 Go 2017-05-11 19:56:20 -04:00
Anewbe
801d91ba8b Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes
More Technomancer
2017-05-09 17:54:53 -05:00
Leshana
8b0cf0617b Fix VOREStation use of color macros so we pass the new stringent macro tests. 2017-05-08 22:34:13 -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
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00