Commit Graph

3829 Commits

Author SHA1 Message Date
Ccomp5950
9f3e58cfe9 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into say_code_fix
Conflicts:
	code/modules/mob/hear_say.dm
2014-04-22 18:25:03 -05:00
Ccomp5950
4e1db5ea47 Merge pull request #4763 from mwerezak/actuator
Fixes #4758
2014-04-21 21:56:33 -05:00
DJSnapshot
fcdbda8383 fix for IPCs taking rad damage. 2014-04-20 21:57:12 -07:00
Ccomp5950
186e78d2cf Say code fixes.
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...
2014-04-20 04:37:46 -05:00
Mike
e955753acf Reverted energy_consumption value
Reverted energy_consumption value for
/datum/robot_component/binary_communication to 0.
2014-04-19 17:17:22 -04:00
Ccomp5950
e1a0cac64b Juggernauts will no longer be weakened and unable to click stuff if zas knocks them over. 2014-04-18 06:40:45 -05:00
Mloc-Argent
28a57a1029 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-18 10:44:21 +01:00
Mike
b00670abc2 Fixed misplace span tags
Fixed some misplaced span tags in say code that were making
alien-language text look funny.
2014-04-17 23:42:45 -04: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
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Mike
0df1ce1b41 Fixes #4758
Fixed issue where removing the power cell would prevent certain checks
on robot components. Also cleaned up
/mob/living/silicon/robot/proc/use_power(), moved code related to status
for better SRP. Added a line to the examine text to hint that the borg
can still move without power.
Sorry for all of this being in a single commit, things got screwed up
with git.
2014-04-16 19:55:22 -04:00
Jarcolr
2ab200681b New IPC Faces - SparklySheep
http://baystation12.net/forums/viewtopic.php?f=44&t=9840
2014-04-14 11:30:29 +03:00
DJSnapshot
756d7a83e9 Merge pull request #4715 from Iamgoofball/FUCKMONKEY
Removes the last traces of Monkey Emergency
2014-04-11 11:47:37 -07: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
Ravensdale
0d589ff569 Changes all instances of PLASMA in active code into PHORON 2014-04-10 00:19:29 -07:00
Ccomp5950
6056b5dc3d Some fixes saycode cleanups
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
2014-04-10 00:05:52 -05:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
Ccomp5950
46704a436b Saycode rewrite: Add support for speech_problem_flag
Ready for Dev
2014-04-08 21:50:01 -05:00
Jarcolr
868dea5681 Grammar patch 1
This is just the first one of many.
2014-04-08 14:48:31 +03:00
Ccomp5950
e1fef1796e Merge pull request #4707 from DJSnapshot/tasers
replaced electrodes with insta hit taser beams
2014-04-07 02:16:01 -05:00
Ccomp5950
80bae7a87d Merge pull request #4705 from DJSnapshot/jumpsuits
Undershirts and rolling down jumpsuits!
2014-04-07 02:12:59 -05:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
RavingManiac
f0bda5a494 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-06 14:28:28 +08:00
RavingManiac
e348f532ab Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets. 2014-04-06 14:20:57 +08:00
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
9915d28fb1 Removal of last debug message and making players be able to use languages over general comms
;:k = skrell speak over general comms for example.
2014-03-30 01:10:02 -05:00
Graham Lloyd
f176b2dea9 I can feel the hugs already. 2014-03-30 00:49:23 -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
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
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
Chinsky
60b6daadee Merge pull request #4641 from Ccomp5950/log_fix
*NIX Log files part 2.
2014-03-27 15:12:19 +03:00
Ccomp5950
936db263ef *NIX Log files part 2.
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
2014-03-26 18:51:37 -05:00
Ccomp5950
bee3d30baa Oops, broke Mesons when I fixed NVG's
This should put things back where they go.
2014-03-26 17:19:51 -05:00
Mloc
38a22e880f Merge pull request #4623 from Ccomp5950/bugfixes
Bugfixes, Various
2014-03-25 08:45:53 +00: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
Ccomp5950
e54ce881eb NVG Bugfix
Now they work, and also added a green hud element that tints the screen green when nvg's are worn.
2014-03-23 13:51:57 -05:00
Ccomp5950
0225d7b3b0 Bug fix 3: Now with a vengence. Monkey pockets cause scrolled chat.
Added the check to see what you clicked in the inventory when clicking on pockets and added a message for it.  Now it won't just be a line break.

Fixes #4601
2014-03-23 06:05:23 -05:00
RKF45
8f9f0acec5 Give bees a chance. 2014-03-22 20:44:13 +01:00
Ccomp5950
28392e9414 Code effeciency project: handle_virus_something() (human and monkey /Life())
2 for loops is more expensive then what we're doing here.
Also we check to see if virus2 is populated before starting a for loop
2014-03-22 07:50:23 -05:00
Ccomp5950
8106b6a4ae Code Effeciency project: Damn monkies Life()
pretty much the same effeciencies from human/life()

no need to updatehealth() over and over and over
no need to process environment if everything is normal
etc.
2014-03-22 06:56:09 -05:00
Ccomp5950
ce83c5c64e Code effeciency project: handle_environment (human/life())
Before:  We process a whole lot of bullshit for no real reason most of the time because temperatures are perfect.

Now:	 We check if our temperatures and environment are within normal bounds and get the hell out of the proc.

Also:    Mobs that are long dead or just dead mobs spawned at round start won't process Life(), those 3 clowns don't need Life(), those jerks.
2014-03-22 06:22:01 -05:00
Ccomp5950
f1506acf1e Code effeciency project: Handle_Organs (human/life())
We do a bit of pre-processing to see if we want to do checks on all the organs.

First we don't even do preprocessing unless we have damage of some kind
afterwards we process what is hurt until it gets better or overall we get worse
when we go ahead and check everything else out again.

Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.
2014-03-22 04:33:48 -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
731f08eb10 Rejuvination verb fix for IPC's limbs don't suddenly become organic. 2014-03-20 20:31:33 -05:00