Alex
f061c0d9d3
Merge pull request #4418 from Ikarrus/minorannouncements
...
Minor Announcements
2014-08-24 13:06:31 +01:00
Alex
cec103fa21
Merge pull request #4454 from Ikarrus/plasteel
...
Ore Redemption Machine can now Smelt Plasteel
2014-08-24 13:05:12 +01:00
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
Alex
be25e5b9e4
Merge pull request #4511 from Limeliz/char-setup
...
Scroll through hair styles and facial hair
2014-08-24 12:59:40 +01:00
Alex
860e905d32
Merge pull request #4539 from Firecage/Spanclasses
...
Spanclasses
2014-08-24 12:58:40 +01:00
ikarrus
ba45abdf25
Admins changing shuttle time will use minor_announce instead of priority_announce
2014-08-23 20:22:47 -06:00
Firecage
dac8669166
Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork
2014-08-23 10:13:21 +02:00
Firecage
7f7f9b3e11
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Spanclasses
2014-08-23 08:29:54 +02:00
Firecage
0948391502
Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research
2014-08-23 02:02:46 +02: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
ikarrus
0891744c8e
Resolved Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
2014-08-21 19:47:30 -06: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
Cheridan
74a4c95bc5
Merge pull request #4488 from Ikarrus/remove-ninja-instagib
...
Phase Shift will no longer instagib
2014-08-21 15:17:25 -05:00
Alex
01354b70f3
Merge pull request #4458 from Ikarrus/trigger_event
...
Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab
2014-08-21 13:28:16 +01:00
Swag McYolosteinen
99913b926a
Merge pull request #4476 from Iamgoofball/hair
...
Adds 25 new hairstyles.
2014-08-21 09:47:42 +02:00
Limeliz
98331d4399
Scroll through hair styles and facial hair
...
Adds < and > buttons to character setup screen to easily scroll to next
or previous hair style and facial hair, intead of opening the popup with
a long unsorted list.
Also adds two procs for returning the value of the previous or next
index in a list.
2014-08-21 02:32:09 +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
Alex
b17bbef1ab
Merge pull request #4493 from Ikarrus/suit
...
RD's Jumpsuit > RD's Suit
2014-08-20 19:31:47 +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
ikarrus
507ae815b5
180 -> 190
2014-08-19 09:04:42 -06:00
Cheridan
71d8dc8976
Merge pull request #4475 from Firecage/recyclingabsolutes
...
Absolute paths for recycling folder files
2014-08-19 09:05:36 -05:00
Alex
616f891d2b
Merge pull request #4402 from paprka/peppergay
...
Buff to condensed capsaicin (pepperspray, teargas)
2014-08-19 10:36:53 +01:00
Alex
99fae13391
Merge pull request #4393 from paprka/emptyclick
...
Empty gun click noise
2014-08-19 10:36:06 +01: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
ikarrus
e0c1fa35ee
RD's Jumpsuit > RD's Suit
2014-08-18 23:16:43 -06:00
ikarrus
4271b6a859
Removing duplicate href code
2014-08-18 22:29:32 -06:00
ikarrus
55799b2ced
Resolved Conflicts:
...
code/defines/procs/priority_announce.dm
2014-08-18 19:44:15 -06:00
ikarrus
8b4e591489
Ninja Phase Shift will no longer instagib
...
-Phase Shift now hurts and knocks the person instead of gg no re instagib they never saw coming
-Phase Slayer deals 180 damage (360 damage to mechas) instead of gibbing them.
-Ninja Random Event now has a spawn delay of one hour
2014-08-18 19:34:50 -06:00
Swag McYolosteinen
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
Alex
7e25fe77e8
Merge pull request #4461 from Jordie0608/tbhtheentirefeatureiskindasilly
...
Updates admin nicknames, moves list to txt file
2014-08-18 08:25:05 +01:00
Alex
67550ba81e
Merge pull request #4472 from Ikarrus/blobreports
...
Command Reports
2014-08-18 08:03:31 +01:00
Incoming
68bcb4dbbd
fixes #4479
2014-08-17 23:55:26 -04:00
KyrahAbattoir
37f9716fb5
Added loot tables for the maintenance and the contraband locker (removed the map edit for now)
2014-08-18 05:40:15 +02: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
ikarrus
0de9402a18
Made receiving and printing centcom reports a proc
...
Also changed a few "Cent. Com." strings to "Centcom"
2014-08-17 13:03:11 -06:00
Aranclanos
b0f0d01d36
Merge pull request #4427 from Cheridan/blow_up
...
Advanced Shotshells
2014-08-17 15:35:08 -03:00
Firecage
6110bd4f04
Absolute paths for recycling folder files
2014-08-17 15:51:15 +02:00
Alex
f0b751c432
Merge pull request #4471 from Firecage/mobabsolutes
...
Absolute paths for files in the mob folder
2014-08-17 13:45:38 +01:00
Alex
b99ce51798
Merge pull request #4448 from Firecage/absolutefood
...
absolute paths for the food&drinks modules folders files.
2014-08-17 13:45:23 +01: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
