Commit Graph

10 Commits

Author SHA1 Message Date
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
mwerezak
d39fc76113 Tweaks space vines
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
PsiOmega
d7e5792f98 Ensures dionaea nymphs respect antagHUD restrictions. 2015-05-07 13:28:35 +02:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Zuhayr
5359d62735 All mobs produced from hydroponics will look for a player. 2015-02-04 10:47:48 +10:30
Zuhayr
e5935e01f1 Span classes. 2015-02-04 10:43:01 +10:30
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
PsiOmega
55e44e1523 Fixes #6868
See https://github.com/Baystation12/Baystation12/issues/6868#issuecomment-60784011
2014-10-28 18:05:04 +01:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
7fb8f30cc7 New machines, adjusted Cael's seeds, rewrote space vines. 2014-07-25 22:15:33 +09:30