PsiOmega
ce30b00287
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
icons/mob/items_righthand.dmi
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr
b5419a1673
Merge pull request #8443 from Baystation12/master
...
Master into dev-freeze.
2015-03-11 19:37:19 +10:30
Chinsky
69a080e2d6
Merge pull request #8421 from Neerti/3_9_2015-examine-text-med
...
Examine Tab Text: (Some) Medical Stuff
2015-03-11 07:28:54 +03:00
PsiOmega
b00138aa42
Fixes #5787 .
...
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279 .
2015-03-10 18:01:27 +01:00
Neerti
e07f06d7f4
I shouldn't proofread when sleep deprived.
2015-03-10 10:55:14 -04:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmegaDelta
ff11ae9d54
Merge pull request #8426 from mwerezak/misc
...
Penetrating bullets are now more likely to go through glass doors
2015-03-10 09:26:11 +01:00
PsiOmega
a86c16b3e3
Fixes hydroponics update_icon() runtime.
...
Rounding could cause plant maturation to have a value of 0.
2015-03-10 08:16:20 +01:00
mwerezak
65a34943cd
Penetrating bullets are now more likely to go through glass doors
2015-03-10 03:00:24 -04:00
PsiOmega
85641b46e5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 07:58:25 +01:00
PsiOmegaDelta
56516d1ec5
Merge pull request #8419 from mwerezak/blazer
...
Adds custom item for Von2531
2015-03-10 07:11:18 +01:00
Chinsky
9c30024ca0
Merge pull request #8411 from volas/admin_stuff
...
Some admin stuff
2015-03-10 09:09:35 +03:00
Neerti
be0971e690
Adds sabiram's help text to the game.
2015-03-09 23:19:15 -04:00
Zuhayr
fb56784fcb
Merge pull request #8408 from mwerezak/examine-fix
...
Examine fix
2015-03-10 09:30:51 +10:30
mwerezak
1150902c9f
Adds custom item for Von2531
...
Blue blazer loadout item
2015-03-09 16:57:10 -04:00
Chinsky
7a066b3c69
Merge pull request #8418 from mwerezak/supply-pack
...
More tweaks
2015-03-09 23:28:15 +03:00
PsiOmegaDelta
78d67a717a
Merge pull request #8384 from comma/spookycat
...
Gave Runtime spirit-sensing capabilities.
2015-03-09 21:17:23 +01:00
PsiOmegaDelta
668c4baee7
Merge pull request #8382 from comma/monkey_revenge
...
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
mwerezak
645910947b
Adds orderable flaregun crate
...
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
volas
5fa66b2a8a
Changes to aooc
2015-03-09 22:59:52 +03:00
mwerezak
91d7dd7049
Adjusts item_state placeholders
...
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
Chinsky
ec9511c943
Merge pull request #8402 from PsiOmegaDelta/RemoteAir
...
Fixes various alarm issues.
2015-03-09 22:07:02 +03:00
PsiOmegaDelta
b09606d85c
Merge pull request #8415 from mwerezak/runtimes
...
More runtime fixes
2015-03-09 17:51:59 +01:00
mwerezak
188c4491c7
Fixes xenoarch runtime
2015-03-09 12:20:08 -04:00
mwerezak
e840ba2d25
Fixes photocopier runtime
2015-03-09 12:12:31 -04:00
mwerezak
385ff4f2fa
Examine tab modularity
...
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
6bfa4ef3d5
Fixes AI freelook runtime
2015-03-09 11:59:02 -04:00
volas
e4e8ef3392
Merge remote-tracking branch 'upstream/dev' into admin_stuff
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-03-09 18:11:10 +03:00
Zuhayr
b43aa4b2b4
Merge pull request #8409 from mwerezak/misc
...
Tweaks for Z8, armour vests, merc blood packs
2015-03-10 00:51:52 +10:30
volas
a9b30da7cc
Small correction
2015-03-09 16:53:08 +03:00
volas
ca07914424
Ability to search bans by bantype
2015-03-09 15:15:08 +03:00
volas
59a113f91c
Ability to search bans by ip and id, and also matches
2015-03-09 15:12:51 +03:00
errorage
64d6012399
Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.
...
If however an admin attempts to add a manual ban for a player who was present during the current round, a player who still has a mob somewhere in the game world, the proc will prioritize the mob's ip and computer id variables, not the things entered in the banning panel form.
2015-03-09 15:08:47 +03:00
Chinsky
d8c2a36f9f
Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
...
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +03:00
volas
c7573a0d11
Antag-OOC
2015-03-09 12:19:50 +03:00
volas
2ad8d26aeb
Play server sound verb for admins
2015-03-09 12:19:47 +03:00
Loganbacca
11d340f898
Projectile effects - Part 3
...
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
Loganbacca
80381a87d0
Projectile effects - Part 2
...
- Converted the root projectiles object to support the new effects system at a generic level
- Converted laser beams to use the new effects system and removed the relics of the old system
- Added muzzle flash for ballistic ammo
2015-03-09 22:17:18 +13:00
Loganbacca
54971c1bf5
Projectile effects - Part 1
...
- Added base projectile effects framework
- Added vector movement helper
- Added temporary effect sprites
2015-03-09 22:17:06 +13:00
GinjaNinja32
bbae1a49e5
Fixes vines spreading through doors
2015-03-09 09:04:22 +00:00
Chinsky
5b7368e627
Merge pull request #8386 from volas/heartbeat
...
Heartbeat sound
2015-03-09 11:45:10 +03:00
mwerezak
a28378f819
Fixes space movement runtime
2015-03-09 03:32:18 -04:00
mwerezak
17780e196a
Fixes medical record cabinet runtime
2015-03-09 03:18:38 -04:00
mwerezak
4c7138db14
Adds four mercenary vests to the merc base, tweaks
2015-03-09 03:15:45 -04:00
mwerezak
5abf0248fc
Firing the Z8 grenade launch automatically switches back to regular firing.
2015-03-09 03:14:26 -04:00
mwerezak
0b5575897d
Updates maint drone helptext
2015-03-09 02:34:21 -04:00
mwerezak
e5a9b686aa
Fixes human examine
...
Fixes issues introduced with the examine tab system by decoupling the
examine() proc from the code that updates a mob's description holders.
Puts a few things in more logical places.
2015-03-09 02:33:43 -04:00
mwerezak
b71f6c1121
Partial breathing refactor
...
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
PsiOmega
cfbba5c153
Station alert monitor should now only react to major alarms.
2015-03-08 17:58:48 +01:00
Zuhayr
a508651115
Merge pull request #8381 from comma/mindfuck
...
More hallucinations mindufuckery
2015-03-09 03:23:36 +10:30
