Perakp
2cf129759b
Showers wet the floor.
2014-09-07 00:11:04 +03:00
Alex
574d5248d4
Merge pull request #4600 from Menshin/2Spooky5Playing
...
Fixes skeletons unable to play xylophone on their ribcage
2014-09-06 19:13:50 +01:00
Alex
9d2e1ffafd
Merge pull request #4630 from Ikarrus/nukeopsetup
...
Nuke Ops Update
2014-09-06 19:10:38 +01:00
Alex
c854ef6667
Merge pull request #4703 from Ikarrus/beepboopiamthelaw
...
Securitrons will only arrest unidentifiable persons when ID check is on
2014-09-06 19:10:07 +01:00
Alex
7a9aeaf15f
Merge pull request #4711 from Ikarrus/consistentwelds
...
Consistent welding sounds
2014-09-06 19:08:53 +01:00
Alex
4ee5afe5a0
Merge pull request #4700 from Ikarrus/syndicatecrate
...
Adds high-end Syndicate crate to cargo
2014-09-06 19:08:35 +01:00
Alex
8fff1aa0c7
Merge pull request #4701 from phil235/goldschlagerfix
...
fixing the icon of goldschlager glass
2014-09-06 19:08:02 +01:00
Alex
5e367a0e37
Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos
...
Logging to add/remove memo
2014-09-06 19:07:54 +01:00
Alex
f2fa83c05b
Merge pull request #4675 from Aranclanos/ninjamask
...
Removes ninja mask modes.
2014-09-06 19:07:01 +01:00
Alex
0ade87d365
Merge pull request #4657 from Ikarrus/betterantagscaling
...
Improved Antagonist Scaling
2014-09-06 19:06:04 +01:00
Alex
368b8b199b
Merge pull request #4682 from Menshin/reagents_consumption_fix
...
Fixes reagents extra consumption + some cleanup
2014-09-06 19:05:42 +01:00
Alex
62a7596270
Merge pull request #4686 from Miauw62/idfix
...
Worn ID won't display on station-bounced broadcasts.
2014-09-06 19:04:59 +01:00
Alex
0a15a88bf8
Merge pull request #4692 from Ikarrus/destroyscale
...
Destroy Objective Probability scales with population
2014-09-06 19:04:47 +01:00
Alex
53e7981a98
Merge pull request #4698 from Ikarrus/roundendreportbugs
...
Fixes Round-End report bugs
2014-09-06 19:04:27 +01:00
ikarrus
93d7aa68c2
Consistent welding sounds
...
Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg
Closets and airlocks were backwards.
2014-09-06 10:06:17 -06:00
Swag McYolosteinen
06fb97b332
Merge pull request #4648 from Firecage/mineralfloors
...
Mineral floors
2014-09-06 17:23:29 +02:00
Firecage
4665e95142
Miauw is annoying
2014-09-06 17:01:45 +02:00
Firecage
a260e70d2b
istypeing
2014-09-06 16:49:03 +02:00
Firecage
c45ddeb365
miauw is weird
2014-09-06 16:28:38 +02:00
Firecage
aab99e8825
Fixes what Miauw said
2014-09-06 15:19:58 +02:00
Swag McYolosteinen
209aa859aa
Merge pull request #4593 from Firecage/orangeshoescuffs
...
No longer can you make shoecuffs with cable cuffs
2014-09-06 12:16:38 +02:00
Swag McYolosteinen
6fc761ab49
Merge pull request #4401 from Lo6a4evskiy/Multiple_holograms
...
Multiple AIs can use single holopad
2014-09-06 11:51:26 +02:00
ikarrus
4ace65b90e
Securitrons will only arrest unidentifiable persons when ID check is on
...
- Sec bots will check if the person is "Unknown" and without an ID if idcheck is on. This means beepsky will stop targetting people at the HoP line, or officers changing his settings. It's meant to target disguised people, as I had originally intended.
- However, sec bots, unable to identify monkeys, will start arresting them if idcheck is on
- Agent IDs buffed to reduce threat level by 5 instead of 2
2014-09-05 20:40:09 -06:00
Lo6a4evskiy
92608c4a05
Updated comment
2014-09-06 00:02:19 +04:00
Lo6a4evskiy
8bd8b00203
Another try to fix line endings
2014-09-05 23:59:00 +04:00
Lo6a4evskiy
4a4dc24c1c
Trying to fix the file
2014-09-05 23:28:06 +04:00
Lo6a4evskiy
036c32caf1
Trying to fix the file
2014-09-05 23:27:43 +04:00
Cheridan
fa26fc1e4f
Merge pull request #4685 from Firecage/Spanclassstuff
...
Spanclass fixes
2014-09-05 13:07:53 -05:00
Cheridan
b8724f469f
Merge pull request #4676 from Aranclanos/woodenbarricadesclickcooldown
...
Added click cooldown for wooden barricades.
2014-09-05 10:46:17 -05:00
Lo6a4evskiy
1139e700a8
Cleanup
2014-09-05 18:32:02 +04:00
Lo6a4evskiy
5332659fa3
Beep boop I suck at git
2014-09-05 18:24:19 +04:00
Lo6a4evskiy
eae6cdbe96
The rest of the junk
2014-09-05 18:14:02 +04:00
Lo6a4evskiy
a1fe0c03a2
Merge branch 'master' into Multiple_holograms
...
Conflicts:
code/game/machinery/hologram.dm
code/modules/mob/living/silicon/say.dm
2014-09-05 18:07:35 +04:00
phil235
d3a6a793ee
fixing the icon_state of goldschlager glass
2014-09-05 11:51:45 +02:00
Firecage
c6a386a13a
Conflict fix
2014-09-05 09:51:25 +02:00
Aranclanos
c487dd350a
Merge pull request #4620 from Cheridan/how_do_they_fit
...
stop asking how crowbars fit in your pocket fffff
2014-09-05 02:44:01 -03:00
Aranclanos
a4446a039b
Merge pull request #4626 from Ikarrus/nudeclones
...
Clones and Podmen will no longer be created with underwear already on
2014-09-05 02:42:43 -03:00
Aranclanos
f5725d785b
Merge pull request #4624 from Iamgoofball/patch-2
...
Removes cult armor from the starting cultist talisman
2014-09-05 02:32:00 -03:00
Ikarrus
84ae64f61c
Update supplypacks.dm
2014-09-04 22:59:37 -06:00
ikarrus
a2535e07dc
Adds high-end Syndicate crate to cargo
...
A high-end crate for traitors. Siphon funds to the Syndicate and they will sneak a reward for you with the next shipment.
Gives you a random syndicate bundle for 140 points.
2014-09-04 22:56:29 -06:00
ikarrus
ca0ccccf72
Apparently New Players have minds so that's not going to be appropriate any more.
2014-09-04 21:11:22 -06:00
ikarrus
c22a44d676
Fixes Round-End report bugs
...
- Fixes #4664 New Players won't get the "you did not survive" message
- Shift duration minutes will never neve have more than 2 digits (Same thing has been done for the Round Duration timer in Check-Antags Menu)
2014-09-04 21:05:07 -06:00
Aranclanos
28a7ba6a6d
Merge pull request #4666 from Miauw62/deafspeakfix
...
Fixes names of hearing while deaf
2014-09-04 21:13:40 -03:00
Aranclanos
50d4ae6561
Merge pull request #4640 from quiltyquilty/quickfix
...
a truly epic fix
2014-09-04 19:58:16 -03:00
quiltyquilty
62d62a28cd
fixes what aran told me to fix
2014-09-04 17:36:27 -05:00
Firecage
e3f469db2a
Does what Miauw said to do
2014-09-04 19:31:15 +02:00
Firecage
cee3e7e7b7
fix3
2014-09-04 16:18:38 +02:00
Firecage
0b129fb646
fix2
2014-09-04 16:00:45 +02:00
ikarrus
abe5d25bf3
A little more fair for traitor objectives
2014-09-04 00:09:06 -06:00
ikarrus
dfa608a12b
Destroy Objective Probability scales with population
...
Instead of being a flat 1% or 2% it will now use prob(100/ticker.minds.len) which will give it roughly the same chance as any crewmember would have of being targetted for assasination.
2014-09-04 00:01:59 -06:00
