Commit Graph
5306 Commits
Author SHA1 Message Date
Fox-McCloud 1d7db62047 Merge pull request #1965 from FalseIncarnate/master
Unknown Language Fix, Shrimp Recipe Tweak
2015-09-09 03:08:45 -04:00
FalseIncarnate 76817f8c59 Language and IPC Random Name Fix
Fixes an incorrect language datum path that was the true culprit for the
"an unknown language" option.
- Fixing this path also has fixed IPC random names being random strings
of 0's, 1's, and the occasional 2.

Re-consolidated the vars for the /datum/language define to be in a
single code block

Adds a new proc for clients that lists all language names, their path,
and whether they are restricted.
- Can only be called via proc-call
- For debugging purposes only, please do not use on live server as it
will spam chat due to sending the messages to world.
2015-09-09 02:43:40 -04:00
Tigercat2000 ee32c0a35a Merge branch 'master' into intent_define
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
TheDZD 0fdfae99ba Merge pull request #1966 from Fox-McCloud/health-assembly
Health Assembly
2015-09-07 17:24:52 -04:00
Mark van Alphen 6c1208e18f Merge pull request #1819 from Aurorablade/GoOnYourFeet
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Tigercat2000 be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud e97e6d1cc9 Merge pull request #1973 from Markolie/intercom
Fix invincible spiderbots and cryo bags
2015-09-06 23:35:49 -04:00
Markolie 8abdc80987 Fix invincible spiderbots and cryo bags 2015-09-07 04:49:55 +02:00
Fox-McCloud 3250621552 Health Assembly 2015-09-06 02:19:44 -04:00
TheDZD fe2a3ef960 Merge pull request #1954 from Fox-McCloud/material-datums
Material datums, Recycler Refactor, and Additional Item Materials
2015-09-05 19:36:15 -04:00
Fox-McCloud fa0489889e Merge pull request #1938 from Aurorablade/BloodIsBad
[Sprite][Balance][Slaughter demon]Bleeding is now illigal
2015-09-04 22:59:05 -04:00
Fox-McCloud 64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Markolie d1cb874451 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 2015-09-05 01:39:40 +02:00
Fox-McCloud 46ce41fbc8 unused var axing 2015-09-04 18:04:34 -04:00
Markolie 26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Mark van Alphen e50fc4639c Merge pull request #1952 from Fox-McCloud/brain-fix
Brain Damage Fix
2015-09-04 08:12:02 +02:00
Fox-McCloud 6d0ee54db2 Merge pull request #1436 from Aurorablade/ImportentpAIUpdate
Best pAI Update EVER
2015-09-03 22:41:07 -04:00
Fox-McCloud 37cb7ee8d5 Brain Damage Fix 2015-09-03 21:59:21 -04:00
Tigercat2000 3b5534f26d Fix mobs being unable to eat other mobs 2015-09-03 14:50:05 -07:00
Markolie 3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Aurorablade 5bb105b80f new icon, nerf 2015-09-02 10:30:23 -04:00
Spacemanspark 76bf14f009 Fixes *halt spam.
I'm sorry.
2015-09-01 22:15:04 -05:00
Fox-McCloud 9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings
Progress bars
2015-09-01 16:45:10 -04:00
Fox-McCloud 2fd18a2410 Merge pull request #1917 from Markolie/byondmembers
Add BYOND member perks
2015-09-01 16:42:34 -04:00
Fox-McCloud d829e7003a Merge pull request #1913 from Markolie/lawmanager
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
Tigercat2000 7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Markolie 5afc4c9cf1 Re-add respawn verb 2015-08-31 20:42:14 +02:00
Markolie 2b109d8400 Add BYOND member perks 2015-08-31 18:52:14 +02:00
Markolie b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie 5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Mark van Alphen 3e30444c1c Merge pull request #1892 from KasparoVy/master
Adds Blind and Mute as Disabilities in Character Creation
2015-08-30 20:42:59 +02:00
FalseIncarnate e8fa1599c6 Assorted Fixes
Fixes toothless shark item using the placeholder fish sprite.

Fixes shark teeth being invisible
- Also slightly randomizes their position like with normal glass shards

Fixes Tobiko Sushi incorrectly being named Ikura Sushi and having an
invisible sprite

Fixes runtimes due to protein being misspelled as "protien" in 4 sushi
defines.

Fixes #1884
- This was caused by diona nymphs lacking the CANPUSH status_flag, which
is required to pass grab checks.
- Gave diona nymphs the PASSMOB pass_flag, should avoid them pushing
people everywhere, and also prevent them from being trapped by other
nymphs/people/Ian.
- CANPUSH and PASSMOB are both flags possessed by mice, so this change
effectively makes the nymph mobs closer to mice than monkeys.
2015-08-30 01:37:11 -04:00
Aurorablade 6b98c1884e Conflict Resoultion part 2
UUUUUUUUCCCCCCCCKKKKKKKKKKKKKKKKKKK
2015-08-30 01:01:15 -04:00
Aurorablade b937cee562 Merge remote-tracking branch 'ParadiseSS13/master' into ImportentpAIUpdate 2015-08-30 00:54:27 -04:00
Aurorablade c1b603c4e8 Conflict Resoultion part 1
FUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU
2015-08-30 00:53:36 -04:00
Aurorablade 558e84ab19 Resolving Conflict Maybeee..... 2015-08-30 00:41:07 -04:00
Aurorablade 0f1a44eb2e Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-29 20:12:41 -04:00
Aurorablade dd558c68e2 Remove an opps and sprite name tweak 2015-08-29 20:05:25 -04:00
Markolie 182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-30 00:38:03 +02:00
Fox-McCloud 1c9da614c4 Merge pull request #1887 from Markolie/performance
sortAtom removal, performance fixes
2015-08-29 18:10:30 -04:00
KasparoVy 963a7c0c96 Part 2 of new Disabilities in Player Creation
Adds blind and mute to the disabilities list.
2015-08-29 14:05:12 -04:00
Markolie 59632e1897 Add new variable instead of using blocked 2015-08-29 03:25:35 +02:00
Markolie de03689105 Fix DNA injector radiation damage 2015-08-29 01:28:47 +02:00
Fox-McCloud fc5a0e8932 Merge pull request #1882 from Markolie/fixes
Fixes
2015-08-28 18:59:54 -04:00
Fox-McCloud d70b644621 Merge pull request #1876 from Markolie/magpulse
Give engineering borgs a permanent magboots effect
2015-08-28 18:42:23 -04:00
Markolie 7e06a35c3b Get rid of laggy construct Bump code 2015-08-29 00:21:29 +02:00
Markolie 2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Markolie e05a8e34db Fix pAI teleporting 2015-08-28 19:42:46 +02:00
Markolie f8e462b1ee Give engineering borgs magboots 2015-08-27 23:59:47 +02:00
Markolie 3d970aba1f Fixes invisible alien leap 2015-08-27 15:54:04 +02:00