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
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
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
mwerezak
645910947b
Adds orderable flaregun crate
...
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04: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
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
GinjaNinja32
bbae1a49e5
Fixes vines spreading through doors
2015-03-09 09:04:22 +00: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
PsiOmega
cfbba5c153
Station alert monitor should now only react to major alarms.
2015-03-08 17:58:48 +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
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
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
Daniel García Baldomir
94477bd66c
Minor fixes on the overlays. Made holosigns functional again.
2015-03-05 21:47:26 +01:00
ccomp5950
ebabf53c6d
Staff now have a "re-admin self" button after de-admining themselves.
...
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
2015-03-05 11:05:58 -05:00
PsiOmega
173f0527eb
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/nano/nanomanager.dm
code/modules/surgery/surgery.dm
2015-03-05 08:05:44 +01:00
Zuhayr
b4b43a6206
Merge pull request #8350 from PsiOmegaDelta/NanoRuntime
...
Fixes NanoUI transfer runtime.
2015-03-05 09:19:41 +10:30
Raptor1628
cf0e526d91
Fixes and adjustments
...
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
PsiOmegaDelta
7d3c01c51e
Merge pull request #8341 from mwerezak/temperature-fix
...
Fixes #7363
2015-03-04 12:40:54 +01:00
PsiOmegaDelta
6799569d16
Merge pull request #8344 from comma/surgeryfixies
...
Surgerything
2015-03-04 11:00:22 +01:00
PsiOmega
05c487ca8f
Fixes NanoUI transfer runtime.
...
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
2015-03-04 09:46:49 +01:00
mwerezak
f8831fa513
Adjusts human temperature damage intervals
2015-03-03 19:31:01 -05:00
Chinsky
b0be5a90ff
Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time.
2015-03-03 13:37:26 +03:00
Chinsky
9be2b8d64c
Merge pull request #8330 from PsiOmegaDelta/Access
...
Increased check_rights flexibility.
2015-03-03 10:21:11 +03:00
