Mloc-Argent
e24dd57a65
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Ravensdale
8e15a76da1
Fixes runtime with yellow slime extracts.
2014-05-12 01:15:45 -07:00
Mloc-Argent
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
Hubblenaut
5b18ec42c4
Fixed Tape Recorders printing transcripts with a 'paper'-prefix
2014-05-02 02:17:46 +02:00
Ccomp5950
7f5b5bb5af
Merge pull request #4851 from thelegendofbrian/pAI
...
pAI GUI Massive Update
2014-04-29 18:49:54 -05:00
Brian Cook
6b16a4140c
Added missing header to pAI Request Module
...
Also changed max frequency of radio config to 159.9 instead of 159.1
2014-04-28 16:56:39 -07:00
Brian Cook
67da07445b
Added refresh button to host bioscan page
...
Also tweaked all pAI GUI so the background doesn't repeat-y
2014-04-28 13:26:52 -07:00
Brian Cook
381a61d6be
Centered background on pAI GUIs
2014-04-27 05:22:36 -07:00
Brian Cook
2ea7ff44a3
Improved GUI for users interfacing with pAI
...
Also minor tweak to GUI for requesting pAI.
2014-04-26 20:13:22 -07:00
Brian Cook
cca92a2e85
Improved GUI for requesting pAI
...
Made the pAI Request Module and the pAI Availability List pretty.
2014-04-26 17:10:37 -07:00
Brian Cook
97c2735820
Fixed pAI Digital Messenger and layout tweaks
2014-04-25 00:12:26 -07:00
Ccomp5950
93b398b4e6
Some more fixes.
...
Derp fix on objects, we check mob contents instead of src.contents for any objects that can hear and pass hear_talk on to it.
Tape recorder will record the verb sent instead of doing it's own thing with verbs.
2014-04-25 02:02:45 -05:00
Brian Cook
6d67400f74
Refined GUI more
...
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
2014-04-24 18:17:41 -07:00
Brian Cook
b8afd2fc5f
pAI GUI changes
...
The pAI GUI background image still need to be properly linked.
2014-04-24 14:04:32 -07:00
Ravensdale
45d82c2e00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/modules/mob/living/say.dm
maps/tgstation2.dmm
2014-04-16 22:13:48 -07:00
PsiOmega
34b0564d26
Adds a necessary check to ensure that pipes on top of plating can be painted.
2014-04-13 11:43:17 +02:00
PsiOmega
93012b3fca
Ensures that one can only paint pipes within range and that there is no blocking floor tile.
2014-04-13 11:31:04 +02:00
DJSnapshot
da3489196c
Merge pull request #4727 from Ccomp5950/FUCK-say-code
...
Saycode rewrite.
2014-04-10 22:42:38 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
Graham Lloyd
b0fc611aca
Lets people put penlights into their ears.
2014-04-01 16:36:58 -04:00
Ccomp5950
e23530e31c
Say code rewrite, Silicon jerks now using new saycode.
...
Tracking added for AI's and Observers
Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()
removed a bunch of my debug verbs.
2014-03-29 23:28:47 -05:00
Ccomp5950
2a0bece954
Saycode rewrite initial commit.
...
Create structure for modular saycode
Regular chat:
specific_paths/say() -> living/say() -> specific_paths/hear_say()
Radio chat:
specific_paths/say() -> Telecoms shit -> specific_paths/hear_radio()
Humans done.
Todo: AI, Robot, simple_animal, and ghosts.
2014-03-21 08:25:20 -05: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
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
Ccomp5950
5c482f1c8c
Merge pull request #4494 from yashaldie/master
...
Fixed Borg toggling broadcast mode
2014-03-01 11:07:41 -06: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
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
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
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
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
Ccomp5950
4f3c404455
People in lobby won't see PDA messages.
2014-02-13 13:03:13 -06:00
Ccomp5950
942ce6ebc7
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2014-02-11 18:07:19 -06:00
Ccomp5950
8ae8949b10
NanoUI PDA - Decreasing initial size of the screen.
...
Gonna miss my XBOX-LARGE pda screen.
2014-02-11 00:56:42 -06:00
Ccomp5950
5810970352
Ghosts can see PDA messages. (Redo: PR #4065 lost in merge)
2014-02-10 20:42:32 -06:00
RKF45
054df7a28b
Keeping the PDA sane.
2014-02-10 21:14:04 +01:00
RKF45
5869a3fc38
PDA bombs are now more balanced and random.
2014-02-07 23:28:40 +01:00
Ccomp5950
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
1fce280da8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-26 20:07:02 +10:30
Kilakk
44962760b8
Removed pointless output
...
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
2014-01-24 15:04:41 -05:00
Kilakk
1a7616fb35
Fixes #4322
...
* There's probably a much more "modular" way of doing this, but, eh
2014-01-23 20:53:05 -05:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
Mark Aherne (Faerdan)
024a0baa49
Canister, Tank & Tank Transfer Value NanoUIs.
...
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00