8a329bac6f
Merge pull request #5699 from MrStonedOne/MutiTask
...
Fixes player panel only allowing one window to be open at a time.
2014-11-07 10:46:55 -08:00
0914b1a7cd
Merge pull request #5642 from phil235/AttackAnimation
...
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
fc6358877f
Merge pull request #5698 from Aranclanos/overrideadminnotice
...
World message removal, admin panel override.
2014-11-07 10:31:38 -06:00
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
c59e9ee20c
Merge pull request #5665 from phil235/CPRFailMsg
...
Add a fail message to unbuckling, breaking out of cuffs and closets and CPR.
2014-11-06 22:18:02 +00:00
7cae2b3bc7
Merge pull request #5678 from Aranclanos/disposalchutes
...
Mechas in disposals fix
2014-11-06 21:57:41 +00:00
3b40d6a20d
Fixes inconsistencies with the player panel
...
Every other admin window that deals with singular things (vv, traitorpanel, etc) lets you have more then one open (as long as its not about the same thing), But not pp, the central point of all of them.
This fixes that and allows you have a window open for each mob.
2014-11-05 13:53:05 -08:00
a8dc2711ce
Swapped the admin panel override alert message from all players to only asay.
2014-11-05 18:16:05 -03:00
ccfe8e41bf
Merge pull request #5647 from Miauw62/halloweenfixes
...
Makes spookoween things a bit nicer.
2014-11-05 14:17:14 -06:00
0e2176c7a0
Added a new proc for movable atoms, disposalEnterTry(). It will be used by disposal chutes to check if the object who bumped them can enter or not.
...
As for the moment, mechas and projectiles will fail.
2014-11-04 17:23:02 -03:00
1bf2574091
M not H. derp
2014-11-04 20:34:44 +01:00
48ad48acce
Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR.
2014-11-04 20:30:04 +01:00
eedf8aaf7c
Spookoween should be mucho bettero now
2014-11-04 19:11:23 +01:00
74f8a08522
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
...
Conflicts:
code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00
377f8bd1fa
Revert "Contaiment fields will now bounce off structures, machinery and mechs"
2014-11-04 00:51:58 -08:00
df13b0d840
Merge pull request #5591 from hornygranny/OOPgularity3
...
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
d5b8ed3155
Merge pull request #5460 from paprka/rdturtle
...
Adds RD turtleneck and updates whimsy
2014-11-03 18:18:18 -08:00
e662932bd1
Merge pull request #5512 from RemieRichards/AcidBurns
...
Acid Rework
2014-11-03 18:11:49 -08:00
e25479cece
Merge pull request #5564 from paprka/defibsfinal
...
[MAP] Defibrillators
2014-11-03 18:08:30 -08:00
268dc0deed
Merge pull request #5502 from tkdrg/ifitwasntforthosemeddlingadmins
...
Creates the "Reset Telecomms Scripts" adminverb
2014-11-03 18:01:10 -08:00
1b6eb8afec
Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-11-03 17:57:40 -08:00
5019876316
Uses the machines list instead of world
2014-11-03 22:51:17 -03:00
415e0e507f
Merge pull request #5629 from TZK13/Hearing-Fixing-Chemical
...
Ports inacusiate from /vg/station, a chemical that instantly heals hearing damage and deafness
2014-11-03 17:50:20 -08:00
06b1a080fe
Merge pull request #5612 from tkdrg/upboat
...
Adds newscaster comments.
2014-11-03 17:49:24 -08:00
56c3f61e35
Merge remote-tracking branch 'upstream/master' into upboat
...
Conflicts:
code/__HELPERS/_logging.dm
2014-11-03 22:38:21 -03:00
38b4f50e3e
Merge pull request #5630 from GunHog/Soft_Silky_Hair
...
Adds three new hairstyles by Mandurrrh!
2014-11-03 17:37:55 -08:00
3d09f8031a
Merge pull request #5632 from GunHog/Botcall_Lagfix_TryTwo
...
Botcall Fix for MC lag + Tweak to floorbots Take Two
2014-11-03 17:35:16 -08:00
bf9679d6cb
Merge pull request #5581 from tkdrg/spacefactory13
...
Constructable conveyor belts!
2014-11-03 17:33:32 -08:00
d7b3b64c7a
Merge pull request #5619 from MrPerson/I_know_this_should_be_two_prs_but_fuck_it
...
Cyborg law additions
2014-11-03 17:27:42 -08:00
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
c1b7d33bc6
Merge pull request #5496 from phil235/BookBinderFix1
...
Busy book binder cannot start a new print job
2014-11-03 17:24:02 -08:00
2b8045ebe0
Merge pull request #5494 from phil235/BiogenFullFix1
...
Biogenerator container fix
2014-11-03 17:23:41 -08:00
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
d79ccb4883
Merge pull request #5608 from tkdrg/whynamesandnotbodies
...
Creates the "Always use random body" option
2014-11-03 17:16:08 -08:00
b32e9cff12
Merge pull request #5621 from tkdrg/damnoldcoders
...
Moves around some vars
2014-11-03 17:15:54 -08:00
b4cc33e64e
Merge pull request #5593 from tkdrg/investment
...
Adds cargo and secrecords to admin_investigate
2014-11-03 17:14:23 -08:00
f73cc93ccd
Merge pull request #5592 from wiox/P2
...
adjustmask() now uses visor_flags and visor_flags_inv
2014-11-03 17:14:07 -08:00
fa4fa09149
Merge pull request #5569 from Menshin/runtimes_roundsup
...
Alek2ander weekly runtimes fixing
2014-11-03 17:13:18 -08:00
fa8fcbba00
Merge pull request #5535 from Perakp/onlyOne
...
Highlander fix
2014-11-03 17:12:26 -08:00
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
c12f67dae7
Merge pull request #5507 from tkdrg/xenonecrophilia
...
Facehuggers no longer violate the dead
2014-11-03 17:11:02 -08:00
85016d7f38
Merge pull request #5493 from tkdrg/pullingyourleg
...
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
cf7de8d24d
Merge pull request #5485 from MrPerson/emo_logging
...
Fixes slimes and borgs not emote logging
2014-11-03 17:08:38 -08:00
c794bdf797
Merge pull request #5432 from tkdrg/outoftheleftfield
...
Contaiment fields will now bounce off structures, machinery and mechs
2014-11-03 17:07:34 -08:00
d3727e6e3e
Removes unused code instead of commenting it out
2014-11-03 18:25:05 -03:00
0335c4adec
Makes ghostpointing invisible (thanks PsiOmegaDelta!)
2014-11-03 18:19:20 -03:00
c1060d95b2
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
...
Conflicts:
code/game/atoms.dm
code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
c4d07ee503
Makes spookoween things a bit nicer.
2014-11-03 20:26:04 +01:00
7f41894319
Gives bots their own place in the MC!
...
- Adds bots to the Master Controller as their own datum instead of
machines.
- Puts bots into their own global list.
- Processes bots asynchronously so as to not hold up the MC processing
them.
2014-11-03 12:39:07 -06:00
2fefe79c1f
Merge pull request #5599 from phil235/CharScreenWindowFix
...
Fix the character setup window's size
2014-11-03 10:39:32 -06:00
hornygranny
Remie Richards
Cheridan
phil235
MrStonedOne
Aranclanos
Miauw
paprka
tkdrg
GunHog