Commit Graph

10842 Commits

Author SHA1 Message Date
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
volas
3d55fc58b9 Additional checks for heartbeat, reduced volume 2015-03-08 19:27:31 +03:00
PsiOmega
44c7b2367a Admin verbs and white/blacklisting or races.
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
2015-03-08 12:25:34 +01:00
GinjaNinja32
9888120b05 Fix simple-animal grabbing 2015-03-08 11:21:38 +00:00
Chinsky
db450303c4 Merge pull request #8379 from Neerti/3-6-2015_help_text_weapons
Examine Tab Text: (Some) Weapons
2015-03-08 10:57:36 +03:00
PsiOmega
c6b0370b6a Mirror and ERT appearance improvement.
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
2015-03-07 23:11:00 +01:00
volas
cef52c73f8 Heartbeat 2015-03-07 18:03:49 +03:00
Chinsky
64f42d592c Gave Runtime spirit-sensing capabilites. Every tick there's a 2% chance she'd stare at a place where ghost is. 2015-03-07 16:48:21 +03:00
Chinsky
f3b6c65038 Added new hallucinations effect - spinning. Changes client dir for 3-5 second for a /real/ mindbreaking. Minor sprite oddities that appear in that mode shouldn't be an issue if you are hallucinating and only last for few seconds anyway. 2015-03-07 16:23:31 +03:00
Chinsky
b730e8309e Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance. 2015-03-07 16:03:43 +03:00
Chinsky
fae7d1c9e9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-03-07 15:18:54 +03:00
Neerti
a49dcb2470 Adds help text and some antag text to common weapons. Makes chameleon gun change proc play nice with multiple definitions. Rest of chameleon stuff will be changed later when I get around to it. 2015-03-06 23:40:50 -05:00
Zuhayr
3895349787 Merge pull request #8374 from Baystation12/dev-freeze
Dev freeze into dev
2015-03-07 12:05:32 +10:30
Zuhayr
ac860b976a Fixing compile issues, adjusted buckle code after a weird merge. 2015-03-07 11:52:14 +10:30
Zuhayr
9f1e04aa50 Thanks TortoiseGit. 2015-03-07 11:40:00 +10:30
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
PsiOmega
0262ab0de0 Runtime fixes
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
  source file: statistics.dm,87
  usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
  src: null
````

````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
  source file: statistics.dm,52
  usr: null
  src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
  source file: helpers.dm,16
  usr: null
  src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
  source file: nanoui.dm,419
  usr: null
  src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
  source file: mob.dm,862
  usr: null
  src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
Chinsky
07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite
Edits Z8 desc
2015-03-06 11:56:31 +03:00
mwerezak
875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
Chinsky
f064305a7b Fixes #8268 2015-03-06 07:11:19 +03:00