Commit Graph

1700 Commits

Author SHA1 Message Date
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master"
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
2014-03-24 13:54:11 +00:00
Jim "Apples"
ae2c398b26 Merge pull request #4611 from Aryn/to-master
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 11:22:37 +00:00
Aryn
de86280434 Ctrl-H "faggot" to "meatball" and one icon state change. 2014-03-20 05:05:23 -06:00
Aryn
1b8dc12a7c I think I fixed everything it is possible to stuff a light source into. 2014-03-19 01:02:27 -06:00
Aryn
9007aedf15 Fixed an annoying bug with giving another player a flashlight,
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.
2014-03-18 22:12:23 -06:00
Ccomp5950
98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm
2014-03-18 19:44:19 -05:00
Jarcolr
b6768b0af0 Telescopic robuster no longer has the stun
It's about time somebody did this. It still has the really really annoying/bad brute damage, but it doesn't just knock you on your ass in one hit anymore.
2014-03-18 18:30:08 +02:00
Ccomp5950
6e56a81531 PDA NanoUI bugfix.
modes that update every 5 ticks won't require clicking the pda 5 times to get a UI window open.

We now check to see if a UI already exists if not we don't check
2014-03-16 04:07:46 -05:00
yashaldie
94a4d27100 Fixes adding encryption keys to borgs
adding Encryption keys were not working on borgs. and also causing a run-time error. This should fix it.
2014-03-10 23:39:36 -04:00
Ccomp5950
ebc188c600 Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/modules/mob/living/living.dm
2014-03-10 21:59:58 -05:00
Chinsky
13b9747504 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-03-10 18:48:12 +04:00
Ccomp5950
084c0754ad Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm
2014-03-09 10:25:36 -05:00
Chinsky
cca2c997df Merge branch 'master' into dev 2014-03-08 12:02:32 +04:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Vetinari
1d62ceddaa Merged Upstream
This is a big one.
2014-03-04 22:19:09 +11:00
Ccomp5950
aa9141fb75 NanoUI Optimizations.
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

Some other things that I just can't remember right now.
2014-03-03 22:50:24 -06:00
Jeremy Liberman
c5261a2796 Wearing masks or straight jackets blocks chewing on your wrists 2014-03-03 20:24:09 -06:00
Jeremy Liberman
4025ccbee5 Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 2014-03-01 22:56:47 -06:00
Ccomp5950
5c482f1c8c Merge pull request #4494 from yashaldie/master
Fixed Borg toggling broadcast mode
2014-03-01 11:07:41 -06:00
Ccomp5950
77767db800 Merge pull request #4487 from zekesulastin/laser-scalpel
Laser Scalpels Ver. 1
2014-03-01 10:55:18 -06:00
DJSnapshot
4492648491 server crash fix based off of https://github.com/tgstation/-tg-station/pull/2943/files 2014-02-28 17:38:58 -08:00
yashaldie
3d7b7a937c Missed some codes...
Forgot to add some code from a past bug fix i did on my end.
2014-02-28 05:42:42 -05:00
yashaldie
a0bb14f76e borg radio fix 2014-02-28 04:58:49 -05:00
Ccomp5950
9c2e3ef84a Merge pull request #4483 from Loganbacca/chemsmoke
Chemsmoke tweaks and bug fixes
2014-02-27 03:42:51 -06:00
Loganbacca
ac8f5451e8 Chemgrenade fix
- If check to handle grenades detonating in a mobs hand correctly.
2014-02-27 14:09:47 +13:00
Ccomp5950
39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-25 20:36:46 +00:00
ZekeSulastin
72eba68bd8 Added laser scalpel items 2014-02-25 15:09:46 -05:00
Chinsky
0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes
Runtimefixes
2014-02-25 06:01:59 +04:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
Ccomp5950
0bcd89360a Runtime fix: I have no UI, and I must close it.
runtime error: Cannot execute null.close().
proc name: Topic (/obj/item/device/pda/Topic)
  source file: PDA.dm,485
  usr: Garry Myers (/mob/living/carbon/human)
  src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
  call stack:
PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
2014-02-24 00:51:57 -06:00
Ccomp5950
1eb66f1f78 Runtime fix blood_DNA length checks when it's possibly null.
runtime error: Cannot read null.len
proc name: attack self (/obj/item/weapon/melee/telebaton/attack_self)
  source file: swords_axes_etc.dm,156
2014-02-24 00:47:55 -06:00
suethecake
32de00eed8 Fix to cloned gun issue - now your holster is located on your tactical armor. 2014-02-22 21:50:21 -06:00
Vetinari
cb1c247767 Updates
Medicine Cabinet(s), Acute Doors
2014-02-22 19:26:42 +11:00
Segrain
05c82c970b Tiny fix. 2014-02-22 06:56:51 +03:00
Segrain
2b9842c113 Smallfix. 2014-02-22 06:56:12 +03:00
Vetinari
28b84ce8b8 Merge remote-tracking branch 'upstream/dev' into dev 2014-02-21 20:01:33 +11:00
Vetinari
db76f164fe Revert "derp"
This reverts commit 77072625dd.
2014-02-21 18:17:15 +11:00
Vetinari
77072625dd derp 2014-02-21 18:17:09 +11:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
Joey Haas
296e839f03 Fixed issue #4439 (Detomax ignores status of messaging server) 2014-02-17 00:18:28 +01:00
Ccomp5950
a7ae5d9a6d Merge pull request #4432 from RKF45/pdabomb
Quick fix for PDAs
2014-02-16 12:53:57 -06:00
Vetinari
1ab6ff320c medical manual
Added medical manual (wiki guide), cmo notes on desk & fixed some radios
2014-02-16 02:29:20 +11:00
Loganbacca
31c24df5e8 Chem grenade fix
- Restored "steam" code to chem grenades to handle grenades that don't have any reagents in them that react i.e. water grenades. (I removed it thinking it was only in there for handling foam reagents, but it seems it has more uses.)
This splashes the surrounding area in whatever reagents were leftover in the grenade after all reactions have occurred.
2014-02-15 23:30:56 +13:00
RKF45
d213d8cb80 Quick fix for PDAs 2014-02-15 02:07:21 +01:00
DJSnapshot
2a28269363 Merge pull request #4398 from RKF45/pdabomb
PDA bombs are now more balanced and random.
2014-02-14 16:40:26 -08:00
Chinsky
499e364971 Merge pull request #4416 from Loganbacca/foam
Chem grenade fixes
2014-02-14 01:35:27 +04:00