8f7649346e
Merge pull request #1346 from d3athrow/identbans
...
Fixes identity bans, no longer will it cause everybody to have a random ...
2013-09-12 15:39:08 -07:00
33b90b805f
Fixes identity bans, no longer will it cause everybody to have a random name and appearance
2013-09-11 00:58:49 -05:00
31bfe2f146
Some reason it pushed the old one...?
2013-09-10 16:24:57 -05:00
f717f00797
Fixes href exploit in borgs, now improved because the last one was kinda silly
2013-09-10 16:23:33 -05:00
9974149b55
adds human, cyborg and alien speech bubbles
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-09-09 11:20:32 +10:00
d1392e4da6
Merge pull request #1319 from Cheridan/revert
...
Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squa...
2013-09-08 05:11:21 -07:00
09430081d7
Merge pull request #1312 from RobRichards1997/06/09/2013-Lizard-Icon-Fix
...
Fixes the invisible dead lizards #1309
2013-09-07 10:36:45 -07:00
7d117587ad
Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squash"
...
This reverts commit 620628563383a6ebfc95
2013-09-06 22:00:11 -05:00
6206285633
Merge pull request #689 from dumpdavidson/changeling_voices_squash
...
Changeling personal hivemind
2013-09-06 15:36:41 -07:00
47e1875899
Fixes the invisible dead lizards
2013-09-06 08:09:37 +01:00
18a76d0387
Re-Adds the Sigh emote
2013-09-05 02:01:36 +01:00
761731c27a
Merge git://github.com/tgstation/-tg-station into critter_crates
...
Conflicts:
icons/obj/storage.dmi
2013-09-02 13:18:15 +02:00
9f1803aae4
Merge pull request #1270 from caelaislinn/terbs_weekly_fun
...
Terbs weekly fun #2 : Laser pointers
2013-09-01 17:55:49 -07:00
286ff34588
moved human helpers out of human.dm to new file human_helpers.dm, added two new mon helpers to check for mutations and mutantraces
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-09-01 13:37:07 +10:00
75d2d35982
Correcting overlooks due to merge from master
...
When I merged master into pull 1245 to resolve conflicts, I didn't notice that
the merge did some unintended things, like duplicating conditionals.
These have been corrected, and I also made more things call ..(act) so that
there is less duplicate code in different emote procs.
2013-08-31 14:10:33 -04:00
b84572dff5
Merge pull request #1266 from Incoming5643/alienfix
...
Aliens can now pick up facehuggers again. Fixes Issue #1044
2013-08-31 08:55:24 -07:00
6e83288a78
Bunch of fixes
...
Cleans up the resist code for lockers
Adds both locked and broken vars to closets
Fixes secure lockers opening when welded, but not locked
2013-08-30 19:59:23 +02:00
5ccfc1c778
Removes the redundant alien check
2013-08-30 12:31:15 -04:00
f738422ebb
Merge pull request #1245 from JJRcop/emotes-rework
...
Emote rework, invalid emotes are passed to ..(), slimes and cyborgs exem...
2013-08-30 09:27:07 -07:00
ba7968cb5f
Aliens can now pick up facehuggers again. Fixes Issue #1044
2013-08-30 12:20:29 -04:00
ff2cf8ea61
Merge pull request #1233 from caelaislinn/pugs
...
Adds missing pug icon states, adds some misc pug behaviour stuff
2013-08-29 09:29:24 -07:00
cdb6fdbdb7
Merge branch 'master' of https://github.com/tgstation/-tg-station into emotes-rework
2013-08-29 01:09:39 -04:00
783aab94b0
Emote rework, invalid emotes are passed to ..(), slimes and cyborgs exempt
...
When an emote fails the switch check for a mob, it calls ..(act).
New files in mob/living and mob/living/carbon with associated procs that
handle these invalid emotes from higher emote calls.
If invalid on mob/living, mob/living will show the invalid emote dialog.
Slimes, Cyborgs, and MMIs do not call ..() on fail.
2013-08-28 18:34:34 -04:00
1ee6c4f5c7
Merge pull request #1166 from Carn/admin_ranks
...
Fixes #1147 (type-mismatch) +features
2013-08-28 11:57:21 -07:00
ec49d21bb5
Adds missing pug icon states, adds some misc pug behaviour stuff
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-08-28 08:43:19 +10:00
7393c4217d
Adds critter crates
...
Fixed several conflicts present in last pull request, should be fine
now.
All animals ordered through cargo will arrive in critter crates. These
crates are designed for the safe transport of animals. Critter crates
can only be unlocked from the outside and automatically lock when
closed. You can resist your way out of the crates. Critter crates are
counted as normal crates when sent back to CentComm.
Adds cat crate (cost: 40 points).
Corgi crate now has a 50-50% chance of either containing a male or
female corgi.
Moves critter crate sprites from storage.dmi to closet.dmi.
Removes redundant large animal crates.
2013-08-27 22:25:42 +02:00
c2e62f3f95
Alphabetized emote code and added help emotes to borgs and slimes
...
Also fixed erroneous view calls
2013-08-26 04:13:42 -04:00
5631d144f9
Merge pull request #1217 from dumpdavidson/nosleepAI
...
Removal of sleep/rest verbs for most mobtypes, fix for forcefeeding brains
2013-08-23 17:24:30 -07:00
4a433db15d
Merge pull request #1210 from dumpdavidson/petborg
...
Pet borgs, remove cells as a monkey
2013-08-23 17:16:40 -07:00
085e0c7eb4
Moved mob_sleep and lay_down away from screen.dm as there hasn't been an ui item associated with them forever.
...
mob_sleep and lay_down are now procs of mob/living, added as verbs to whichever mob should have the ability to sleep or lay down (alien, monkey, human as of now)
2013-08-23 17:54:36 +02:00
787f02b7a2
Merge pull request #1161 from KazeEspada/monkeys
...
Monkey fixes
2013-08-23 07:12:43 -07:00
12e8a54e13
Merge pull request #1170 from Cheridan/Cult
...
Nar-sie change + Construct Names
2013-08-23 07:07:22 -07:00
3b303325b8
Merge pull request #1209 from Carn/Ian
...
Fixes #1208 - there was a return instead of a continue
2013-08-23 06:55:27 -07:00
4b54dd8074
Removed sleep/rest verb from non-carbon mobs, slimes and brains.
...
Fixed the possibility to forcefeed brains snacks.
Removed the countdown of various status effects in brain's life() proc that shouldn't happen to brains anyway.
2013-08-23 14:12:12 +02:00
cc1e3d2b6d
Merge pull request #1178 from caelaislinn/pugs
...
Adds pugs, makes pugs orderable via cargo
2013-08-22 22:52:48 -07:00
2d6768c1e9
Merge pull request #1185 from VistaPOWA/npc_behaviour_fix
...
Stops idle syndicate mobs from destroying surroundings
2013-08-22 22:47:42 -07:00
e9f269b427
You can now pet borgs as a human or monkey.
...
Monkeys can now remove cells from borgs (they could insert them and use every tool on them, just not remove cells).
2013-08-22 15:17:23 +02:00
3452f93692
Finalizing fixes
2013-08-22 13:05:14 +01:00
4ba53e0eeb
Fixes some more issues with sechuds - you can no longer look at yourself to change your status - setting somebody else's status no longer incorrectly uses your name for the record-lookup
2013-08-22 12:12:32 +01:00
f33c09b0c5
Fixes #1208 - there was a return instead of a continue
...
Corgis now get a love-heart float above their head and yap happily when you pet them (only visible to the person petting them).
2013-08-22 11:37:04 +01:00
4deebff554
Merge branch 'master' of https://github.com/tgstation/-tg-station into changeling_voices_squash
...
Conflicts:
code/game/gamemodes/changeling/changeling.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
2013-08-21 23:21:26 +02:00
537e422afc
oops, missed a mob
2013-08-20 03:03:33 +02:00
a867353329
Removed redundant var idle_env_destroyer from hostile mobs
2013-08-20 00:39:05 +02:00
30d5ccb1d6
Makes hostile mobs destroy their surroundings by default.
2013-08-19 19:31:04 +02:00
b25efc1e3a
Merge pull request #1159 from Giacomand/malftransforming
...
Added the transforming machine to the Malf AI's Modules.
2013-08-19 02:46:55 -07:00
bfeef72660
Merge pull request #1102 from Aranclanos/Linda
...
Linda.
2013-08-18 15:27:23 -07:00
e5f4deba9d
Stops idle syndicate mobs from destroying surroundings
...
Adds a variable ('idle_env_destroyer') to all hostile mobs, denoting
whether the mob destroys it's environment while idling or not. Default
value is 0 (no). Syndicate, russian and pirate mobs are affected. Also
prevents aforementioned mobs from suiciding and/or wrecking away mission
environments before the player could see them.
Fixes hostile mobs interpreting 'null' as a valid target and always
being in HOSTILE_ATTACK stance.
2013-08-18 23:06:58 +02:00
21d35fb586
adds pugs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-08-17 10:12:40 +10:00
62a6a02db9
Constructs get named-numbers now so you can actually tell who's being a gryphon/reading WGW over the radio.
...
Tweaks to Newsie
2013-08-15 14:35:04 -05:00
e2f9e615ff
Merge branch 'master' of https://github.com/tgstation/-tg-station into malftransforming
...
Conflicts:
html/changelog.html
2013-08-15 10:28:14 +01:00
MrPerson
d3athrow
Cael_Aislinn
Aranclanos
Cheridan
Ricotez
Robson Richards
VistaPOWA
JJRcop
Incoming
JJRcop
dumpdavidson
carnie
Giacomand