hornygranny
d81eb696c4
Merge pull request #5570 from xxalpha/noslipfloor
...
High-traction Floor
2014-11-03 17:37:20 -08:00
hornygranny
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
hornygranny
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny
b32e9cff12
Merge pull request #5621 from tkdrg/damnoldcoders
...
Moves around some vars
2014-11-03 17:15:54 -08:00
hornygranny
fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
hornygranny
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
hornygranny
0a0cd991de
Merge pull request #5516 from paprka/telestunfix
...
fixes telebaton stunning borgs
2014-11-03 17:11:39 -08:00
hornygranny
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
Cheridan
a28abaf72a
Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn
...
Make buckled mobs anchored if their chair is anchored
2014-11-02 22:40:20 -06:00
Cheridan
6e29ad75d5
Merge pull request #5492 from tkdrg/nofunallowed
...
You can no longer put transit tube pods in a station that already has one
2014-11-02 11:56:20 -06:00
tkdrg
7ebc4bb742
Merge remote-tracking branch 'upstream/master' into pullingyourleg
...
Conflicts:
code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
Cheridan
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
Cheridan
71fe1bf00b
Merge pull request #5597 from phil235/IdMsgFix
...
Fix the 'show ID' message.
2014-11-02 11:10:16 -06:00
tkdrg
a97c4de972
Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)
...
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
2014-11-02 14:10:03 -03:00
Cheridan
4f58312d76
Merge pull request #5596 from phil235/LipstickFix
...
Fix for #5588
2014-11-02 10:39:21 -06:00
Cheridan
ef29aaef57
Merge pull request #5598 from phil235/PDAsoundFix
...
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -06:00
MrPerson
05b2146a7d
Fix anchored issues with alien nests
...
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
2014-11-02 05:46:03 -08:00
tkdrg
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
Menshin
8202bde945
Even the damned statue !!!
2014-11-01 22:06:59 +01:00
phil235
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
phil235
4803f099f6
Fix lack of sound when non-silent PDA receive message.
2014-11-01 15:32:48 +01:00
phil235
c8f3ad2dd0
Fix ID show message.
...
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
2014-11-01 15:17:43 +01:00
phil235
af767f2935
Fix being able to apply lipstick through masks and items covering the mouth.
2014-11-01 13:28:32 +01:00
Remie Richards
0bc683aa29
Merge pull request #5457 from GunHog/AI_Radio
...
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
xxalpha
b9f5947f5e
High-traction Floor
2014-10-31 01:50:31 +00:00
Menshin
6176ee9f0f
conflicts fixing
2014-10-31 02:43:00 +01:00
Menshin
cce46b39eb
Fixes runtimes related to clown_ore -> bananium changes ( fixes #5554 ).
...
Fixes runtimes related to security records (fixes #5552 ).
Changing the name in the security database now also change it in the general database.
2014-10-31 02:30:34 +01:00
Hornygranny
9c95842adf
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
...
Conflicts:
code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07:00
tkdrg
0bb462e857
Fixes botcall conflicts, removes even more cruft and unused code
2014-10-30 20:36:30 -03:00
tkdrg
9526b8804b
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-30 19:35:03 -03:00
MrPerson
d14d5ac6a1
Make buckled mobs anchored if their chair is anchored
2014-10-29 22:56:11 -07:00
tkdrg
7db4f1f9a2
Fixes chat channel bugs, removes PDA authentication because apparently our players are too dumb to not share passwords between ss13 and banking accounts
2014-10-29 23:00:23 -03:00
tkdrg
cc96d09843
Adds NTRC help screen, fixes PDA /join bug that let you join multiple times without updating chat_channel
2014-10-29 20:50:08 -03:00
tkdrg
571a0953b4
Fixes chatroom runtime (thanks Gun Hog!), auto-adds # if the channel does not contain it already, obsoletes /new (its functionality is now included in /join)
2014-10-29 20:17:16 -03:00
tkdrg
ab6ca61e2a
Lets AIs and pAIs use the chatroom function in their built-in PDAs.
2014-10-29 19:32:23 -03:00
GunHog
a216b7024e
Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
tkdrg
90d9dddf39
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/client/client procs.dm
2014-10-29 01:27:08 -03:00
tkdrg
3a862deb6b
Adds chatroom logging (both admin and IC).
2014-10-29 01:20:53 -03:00
Cheridan
1aef19c835
Merge pull request #4974 from GunHog/Botcall_TG_Edition
...
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
paprka
1b91ab24ce
Improves mining equipment locker and rewards system, and buffs kinetic accelerator
2014-10-28 15:42:55 -07:00
Hornygranny
cc21fd1e70
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Remie Richards
07ff02b7c4
Merge pull request #5477 from MrPerson/space_movement_jam
...
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
paprka
635458446a
fixes compile errors by assigning proper target for checks
2014-10-28 09:51:36 -07:00
paprka
b0be021739
fixes telebaton stunning borgs
2014-10-28 09:03:46 -07:00
GunHog
19ab2c4a2b
Logic fix + Tweaks
...
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
MrPerson
e9f6e5d17d
Added a changelog entry
...
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
Hornygranny
5b2c635710
items thrown at size 7, floor tiles pulled up at size 5, floors ripped into lattices at size 9
2014-10-27 20:29:41 -07:00
paprka
5599d9b2b7
advanced mop cleans twice as fast as the normal mop
2014-10-27 19:04:01 -07:00
Hornygranny
68ca3ad091
projectiles no longer anchored, spawns off throw
2014-10-27 18:00:35 -07:00
