Alex
10cfc1d4bc
Merge pull request #4445 from Incoming5643/meetthemeat
...
Adds unique meat types for throwing mutant races in the gibber
2014-08-24 13:04:10 +01:00
Alex
80251c2bf2
Merge pull request #4529 from Firecage/ZombieIan
...
This fixes Zombified Ian
2014-08-24 13:01:54 +01:00
Alex
1cf20bb083
Merge pull request #4519 from Firecage/simpleanimalattacktextfix
...
Fix for simple animal attack text on humans.
2014-08-24 13:01:33 +01:00
Alex
944966ba93
Merge pull request #4520 from Firecage/Messagefixes
...
This fixes the message issues
2014-08-24 12:59:52 +01:00
Swag McYolosteinen
1a30c9c147
Merge pull request #4522 from ChuckTheSheep/Search-Fix
...
SearchFix - Fixes #4497
2014-08-22 20:02:27 +02:00
Firecage
6eacb45fc5
This fixes Zombified Ian
2014-08-22 15:54:56 +02:00
ChuckTheSheep
747e35c1c8
SearchFix - Fixes #4497
2014-08-21 20:47:58 -04:00
Firecage
4198e61af1
This fixes the message issues
2014-08-22 01:15:13 +02:00
Firecage
d0fb8fcfc2
Fix for simple animal attack text on humans.
2014-08-22 00:34:52 +02:00
Swag McYolosteinen
99913b926a
Merge pull request #4476 from Iamgoofball/hair
...
Adds 25 new hairstyles.
2014-08-21 09:47:42 +02:00
Alex
eff867c5f0
Merge pull request #4474 from Cheridan/slime_fix
...
Fixes infinite slime nutrition exploit
2014-08-20 19:35:46 +01:00
iamgoofball
6fc3974228
fixes
2014-08-19 15:58:13 -07:00
iamgoofball
013cf24842
we can now translate the hairstyle names without being a doritos munching mtn dew chugging 4chan pass owner
2014-08-19 15:43:05 -07:00
Alex
196f861efb
Merge pull request #4441 from Ikarrus/brigtimer_notice
...
Brig cells and Labor Shuttle will notify SecHUDs on release of a prisoner
2014-08-19 10:32:50 +01:00
Alex
c8bd6af8bf
Merge pull request #4480 from Incoming5643/statuefix
...
fixes #4479
2014-08-19 10:20:56 +01:00
Incoming
68bcb4dbbd
fixes #4479
2014-08-17 23:55:26 -04:00
iamgoofball
5711f4a917
fixes
2014-08-17 14:37:30 -07:00
iamgoofball
eb66b49b70
Adds 25 new hairstyles.
2014-08-17 14:13:42 -07:00
Cheridan
ca087cb59e
Fixes infinite slime nutrition exploit
...
Cleans up a disgusting if else pyramid.
Fixes an issue where the upper limit on nutrition did nothing at all.
I'm very upset at whoever added the feature to eat simple_animals.
2014-08-17 00:16:53 -05:00
Firecage
6d4f296331
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into mobabsolutes
2014-08-17 02:56:45 +02:00
Firecage
35af394b9a
Absolute paths for files in the mob folder
2014-08-17 02:45:35 +02:00
Alex
14749abdf9
Merge pull request #4397 from Jordie0608/ogdensnutgoneflake
...
Spanifies aliens
2014-08-16 14:05:09 +01:00
Alex
ec926db19d
Merge pull request #4408 from Aranclanos/canusetopicelectricboooogalo
...
canUseTopic() strip panel, take 2.
2014-08-16 13:39:12 +01:00
Alex
fdceca4c72
Merge pull request #4415 from Aranclanos/spinninnnnng
...
Disguised crash fix
2014-08-16 13:38:40 +01:00
Cheridan
4030165734
Merge pull request #4074 from AndroidSFV/aiphotoext2take2
...
AI Photography Extention 2 (The Redux)
2014-08-15 19:32:17 -05:00
Incoming
139170e926
Adds unique meat types for throwing mutant races in the gibber
...
They can still be used in any recipe human meat/meat will do for
Eating fly/slime meat isn't a good idea
Recipes for mutant meats could come later
File this under "stuff I wanted to do a year ago but couldn't because mutantraces were so trash but now its not so why the fuck not"
2014-08-15 12:32:54 -04:00
ikarrus
ef6ca38348
Brig cell timers notify SecHUDs when the timer has expired
...
Helps Wardens keep track of prisoners and hopefully reduces re-arrests of released prisoners
It's all in a new proc, broadcast_hud_message() which handles securitron arrest declarations as well.
2014-08-14 22:34:33 -06:00
Aranclanos
e89499672c
Added a spinning visual effect to rolling on the floor to extinguish yourself in case of a fire.
...
Lube will now make you spin while you're slipping.
Water will make you slip on the spot and won't move you forward.
Fixed the bug of wrong mob directions when buckling them while they are lying down.
2014-08-13 20:53:20 -03:00
Aranclanos
fd66b5710a
The strip panel will now use canUseTopic().
...
Cyborg and AI canUseTopic() procs will now include a BE_CLOSE variable, just in the case of having to be near the atom.
Added a BE_CLOSE and NO_DEXTERY define, they are both 1.
Third argument for canUseTopic(), dextery check, if a monkey or alien or whatever can perform the action.
2014-08-13 08:50:51 -03:00
Jordie0608
a6c3564ed3
Spanifies aliens
2014-08-12 22:17:33 +10:00
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
Alex
12b8bba238
Merge pull request #4362 from paprka/borghailer
...
Adds sec hailer to secborg modules
2014-08-11 14:02:51 +01:00
Swag McYolosteinen
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
paprka
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
Aranclanos
866bf55b48
Merge pull request #4377 from Jordie0608/ogdensnutgoneflake
...
Fixes #4338 multiple weed nodes on turf
2014-08-09 16:21:32 -03:00
Cheridan
365de76240
Merge pull request #4340 from MrPerson/giacom_was_right_I_should_have_just_deld_mobs
...
Make new_players dereference from their mind when observing
2014-08-09 11:19:07 -05:00
Jordie0608
1ed6d7921c
stops doubling of weed nodes
2014-08-09 01:54:16 +10:00
Alex
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
paprka
8c4bde6be8
adds secborg hailer
2014-08-07 05:00:10 -07:00
paprka
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
paprka
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
MrPerson
c813d9df46
Make new_players GC when observing
...
When observing, that observer would be given their original new_player's mind, but that mind would still have the new_player as its current. This caused the new_player to fail to GC and resulted in the observer's mind's current becoming null.
Fix: Just delete the new_player mind when the player observes. If an admin turns them into a human or whatever, a new mind will be created automatically then.
2014-08-05 18:50:09 -07:00
Alex
bec4e856ca
Merge pull request #4327 from Aranclanos/clickcooldowndefine
...
Defines for click cooldown numbers and click cooldown for paper camera spam.
2014-08-05 10:22:52 +01:00
Alex
7946e96fcb
Merge pull request #4326 from Aranclanos/strippanel
...
Strip panel.
2014-08-04 09:26:24 +01:00
Aranclanos
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
Aranclanos
f5ee1a573a
The set internals button on the strip panel will properly appear if it's on the exosuit.
...
The strip panel should be prettier now.
2014-08-03 17:59:56 -03:00
Zelacks
5a899fde87
Fixed icons not disappearing on embryo removal
...
Basically for whatever reason I did not see affected mob was a variable
and instead used loc for determining the mob affected by the embryo
Changed it to use affected mob, which actually should fix a lot of
fringe cases where the icon would not remove the correct icon
2014-08-04 04:15:40 +08:00
Incoming
ac0a1d1813
Fixes #2738
...
Only 6 months later than I could have fixed it!
#FreeTheTinCans
2014-08-02 23:29:41 -04:00
Zelacks
e9a3036ef5
Alien Icon Fixed and revamped
2014-08-01 04:16:43 +08:00
