Commit Graph

13438 Commits

Author SHA1 Message Date
Markolie d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Mark van Alphen 3984d0a311 Merge pull request #2232 from Robertha89/patch-2
Gives engineering more power at start
2015-10-01 03:41:06 +02:00
Tigercat2000 413f35298e okay mark 2015-09-30 16:44:25 -07:00
Mark van Alphen cf9a35479c Merge pull request #2220 from tigercat2000/more_ai_stuff
Add a few variables to the AI announcment message
2015-10-01 01:41:32 +02:00
TheDZD d9f3cae655 Merge pull request #2231 from Markolie/hotkeys2
Hotkey/interface update
2015-09-30 19:40:49 -04:00
TheDZD 9b7b1c1913 Merge pull request #2217 from Markolie/s2
Add AI text announcements
2015-09-30 19:40:43 -04:00
Markolie 9ec1f3987c Make darkness clickable 2015-10-01 01:35:59 +02:00
Tigercat2000 575362b0f4 Move buckling to /atom/movable, can now buckle to mobs if adminbooze
Also changed:
 - Comment clarifying what buckle_lying = -1 means
 - Changes direction of lying on operating tables, somehow missed it
2015-09-30 15:29:47 -07:00
Robertha89 36115ed8aa Disregard that 2015-09-30 21:23:43 +02:00
Robertha89 f07a82936f Magical SMES for consistancy 2015-09-30 21:22:43 +02:00
Robertha89 1a463b75f0 Reduce starting power 2015-09-30 21:21:10 +02:00
Mark van Alphen 7565da30ec Merge pull request #2216 from Aurorablade/YETMOREBLOOD
In whitch the Slaughter demon gets changed
2015-09-30 20:40:48 +02:00
Tigercat2000 e39c69a8a6 Change paper to work based on say_understands;
This means that if you have galactic common in your languages, or
understand/speak all languages, you can also read paper.
2015-09-30 11:12:16 -07:00
Tigercat2000 c4fa813331 Remove remaining arbitrary restrictions on has_fine_manip
This commit removes all (most) of the remaining code limiting xenomorphs
that have has_fine_manipulation on an entirely arbitrary basis. Xenomorphs
with has_fine_manipulation may now interact with NanoUI, and will only
break computers on non-help intent. The can also tear down walls, since
walls used an ishuman check in place of an isAdvancedToolUser check as
they should have.

Minor refactor to machinery.dm as well; Instead of the slightly
(completely) insane attack_hand restriction to humans and silicons (it was
a multi-line IF, why), it now checks user.IsAdvancedToolUser(); This means
restrictions on monkies will actually function properly now.
2015-09-30 10:50:10 -07:00
Tigercat2000 b5218bfb5c Fixes monkey cubes, more or less
They will now unEquip() if they are in a mob, therefore clearing the hand
ref to them.
2015-09-30 09:34:11 -07:00
Markolie 6f0a8174ad Guns rename, take two 2015-09-30 15:51:14 +02:00
Markolie 7b97739a49 Remove duplicate procs, fix examine text 2015-09-30 15:34:17 +02:00
Fox McCloud f000c0c225 Merge pull request #2238 from Markolie/emotes
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Mark van Alphen f10fd6e1ee Merge pull request #2212 from Spacemanspark/master
Makes *deathgasp less snowflakey
2015-09-30 04:30:53 +02:00
Markolie 1a7c565482 Fix 2015-09-30 03:38:44 +02:00
Markolie 9277a2f55e Dsay fix 2015-09-30 03:35:30 +02:00
Markolie 8d99c8c689 Add cooldown to chirp emote 2015-09-30 03:04:15 +02:00
TheDZD d84868d43f Merge pull request #2229 from Markolie/hotkey
Admin PM fix
2015-09-29 20:25:56 -04:00
Aurorablade fad133c70c trying this whole force move dealy... 2015-09-29 19:37:57 -04:00
Markolie 3c0931ba7d Better hotkey mode handling 2015-09-30 01:34:51 +02:00
Markolie 85009d81d8 Sanity checks 2015-09-30 01:26:22 +02:00
Markolie a2c05f45d4 Reboot fix 2015-09-30 01:12:31 +02:00
Robertha89 7184df0aac Fixes Name issue and gives engineering more power
Very often now, this is how the round starts, power starts going out, engineers does nothing, nobody does anything, and there are so many rounds where the power runs out station wide, i.e it takes an hour to set up power, this will buff the starting power of engineering, so that power does not start running out during the first half hour of the shift.

Also, fixes the name back to SMES.

This can be considered a somewhat controversial pull.
2015-09-30 01:06:25 +02:00
Markolie 8ad7eb56c2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into hotkeys2
Conflicts:
	config/example/config.txt
2015-09-30 01:04:45 +02:00
Markolie 2f9fd64a55 Hotkey/interface update 2015-09-30 01:02:58 +02:00
Fox McCloud 15c9873cdf Merge pull request #2224 from Markolie/shitcode
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie f7c2685122 Admin PM fix 2015-09-30 00:21:55 +02:00
Markolie 8b2e62fc10 Strange reagent fix, tod --> timeofdeath 2015-09-29 22:03:04 +02:00
Mark van Alphen bee80d49cb Merge pull request #2211 from Crazylemon64/stickier_beakers
Stickier cyborg beakers
2015-09-29 21:55:48 +02:00
Crazylemon 734e0842e2 Fixed a few more reversed add_logs
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Crazylemon 9678fe09ec Replaced location setting with forceMove()
I'm restricting this only to the machine's I'm affecting with this fix.
Refactoring the rest of the code to use it would be for a different
thing.
2015-09-29 11:09:38 -07:00
Tigercat2000 b09c4f7b85 Add a few variables to the AI announcment message
Variables added:
 - $species : Species name of the individual.
 - $age : Character age
 - $gender : Character gender, limited to female/male, sorry tumblr
2015-09-29 10:15:41 -07:00
Markolie a810a37cdd Announcement update 2015-09-29 19:00:20 +02:00
Fox-McCloud 18a340085c Merge pull request #2219 from tigercat2000/tuhtuh
Fix exploit, refactor access to body color,
2015-09-29 12:21:25 -04:00
Tigercat2000 3c80bd7eb1 Fix exploit, refactor access to body color,
let IPC's actually change color as non-admins
2015-09-29 08:52:20 -07:00
Fox-McCloud 7586390436 Merge pull request #2146 from TheDZD/vision
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
Markolie a135e67f71 Add AI text announcements 2015-09-29 06:59:27 +02:00
TheDZD 6705006ee7 Merge pull request #2213 from Fox-McCloud/destroy-fixes
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
DZD b990b6c71b Merge remote-tracking branch 'upstream/master' into vision 2015-09-28 19:03:14 -04:00
Spacemanspark 34b1a3a52f Adds the death message to monkeys again. Oops. 2015-09-28 17:40:24 -05:00
Fox-McCloud be672419ca Fixes a few Destroys 2015-09-28 18:15:39 -04:00
Spacemanspark 197f0b7219 makes *deathgasp less snowflakey 2015-09-28 16:58:28 -05:00
Spacemanspark 624b7cbc71 Gives IPC's a unique death message in a less snowflakey manner. 2015-09-28 16:57:16 -05:00
Spacemanspark a02d843153 De-snowflakes *deathgasp 2015-09-28 16:55:04 -05:00
Crazylemon a1636b3b24 NODROP is now more respected
A few machines, especially in medical, didn't respect NODROP. Hopefully
with these changes, medical cyborgs should no longer get their beaker
stuck in some sort of bizarre multipositional limbo.
2015-09-28 14:48:06 -07:00