Fox McCloud
62d25caec7
Merge pull request #2252 from tigercat2000/atommovablebuckling
...
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
2015-10-01 19:01:39 -04:00
Fox McCloud
fc5641d926
Merge pull request #2253 from Markolie/darkness
...
Make darkness clickable
2015-10-01 17:11:31 -04:00
Fox McCloud
bc62bf7fa4
Merge pull request #2247 from Markolie/guns2
...
Guns rename, take two
2015-10-01 13:28:55 -04:00
Mark van Alphen
b004303cf6
Merge pull request #2245 from Fox-McCloud/ZAS-Is-Dead
...
And So Dies ZAS
2015-10-01 19:27:22 +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
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
Mark van Alphen
1739451be8
Merge pull request #2246 from Crazylemon64/roller_holder_fix
...
Fixes the roller_holder to work again
2015-09-30 18:52:13 +02: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
Crazylemon
aaaaa14ae8
Fixes the misplaced quote
...
Does not fix: How tired I am
2015-09-30 08:05:34 -07:00
Crazylemon
d925ee8a10
Fixes the syntax errors and is more consistent with messages now
2015-09-30 07:59:29 -07:00
Markolie
6f0a8174ad
Guns rename, take two
2015-09-30 15:51:14 +02:00
Crazylemon
6c5a643944
Fixes the roller_holder to work again
...
After the buckling rehaul, the roller holder couldn't unbuckle patients
nor collapse/collect beds. This should readd that functionality.
2015-09-30 01:42:35 -07:00
Fox-McCloud
3236fa8be5
And So Dies ZAS
2015-09-30 02:00:39 -04: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
Mark van Alphen
b164da999a
Merge pull request #2234 from tigercat2000/RIP_in_piss
...
Remove unused ZAS files. Rest in piss, ZAS.
2015-09-30 02:52:22 +02:00
TheDZD
d84868d43f
Merge pull request #2229 from Markolie/hotkey
...
Admin PM fix
2015-09-29 20:25:56 -04:00
Tigercat2000
aff2ab6cd9
Remove unused ZAS files. Rest in piss, ZAS.
2015-09-29 17:16:59 -07:00
Mark van Alphen
d3c3459a0f
Merge pull request #2227 from Crazylemon64/stickier_beakers
...
Fix Beaker Fix so Robots can Wire Machines Again
2015-09-30 01:45:03 +02:00
Aurorablade
b88d88de53
Merge remote-tracking branch 'ParadiseSS13/master' into YETMOREBLOOD
2015-09-29 19:38:50 -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
2712c4dba8
Add spaceport security to blacklist
2015-09-29 23:18:05 +02:00
Crazylemon
13b97712a2
Stacks can now be added to machines again just fine
...
Also took out the unnecessary "You can't add this to the machine!"
message when using a screwdriver on frames
2015-09-29 14:15:47 -07: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
Mark van Alphen
603a77bc3d
Merge pull request #2218 from Fox-McCloud/safe-cleanup
...
Safe Cleanup and Fix
2015-09-29 21:55:07 +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
Mark van Alphen
25f19dff0d
Merge pull request #2204 from Fox-McCloud/belt-of-holding
...
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
