Commit Graph

3395 Commits

Author SHA1 Message Date
Jarcolr
868dea5681 Grammar patch 1
This is just the first one of many.
2014-04-08 14:48:31 +03:00
RavingManiac
ac9d37261f Check restricted to closets and storage items due to lag concerns. 2014-04-07 20:45:05 +08:00
RavingManiac
795df2b2c9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-07 20:18:20 +08:00
Ccomp5950
82d4d3a497 Merge pull request #4712 from Jarcolr/kilo
Fix for #4701 and immersion
2014-04-07 02:20:55 -05:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Chinsky
4ee7569858 Merge pull request #4694 from mwerezak/master
Fixes #4689, #4680
2014-04-06 22:12:08 +04:00
Chinsky
5300508fc2 Merge pull request #4702 from Jarcolr/patch-2
Kicking a grille does 2 less damage; fix for #4557
2014-04-06 22:11:43 +04:00
Jarcolr
b83e0f2ad7 Adds additional text to lighting 2014-04-06 13:24:44 +03:00
Jarcolr
b6ee8a62b0 Fix for 4601 and immersion
Premium Cigar now understands being lit,and the corn cob pipe/ cigars
now no longer refuse being hit by fire.
2014-04-06 12:43:58 +03: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
Jarcolr
a3bf9733a2 Kicking a grille does 2 less damage; fix for #4557
It will now take 10 hits to destroy it without using a weapon or tools.

Take that,metagamers!
2014-04-05 19:15:41 +03:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2
A first pass at more realistic w_class values
2014-04-05 16:23:59 +01:00
Mike
920a08412b Fixes #4689
Rods can't break reinforced windows.
2014-04-05 00:38:48 -04:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2014-04-04 01:14:31 -05:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
13532e1ddd Merge pull request #4655 from RavingManiac/dev
Inflatable walls and airlocks
2014-04-03 13:31:39 -05:00
Graham Lloyd
b0fc611aca Lets people put penlights into their ears. 2014-04-01 16:36:58 -04:00
Ccomp5950
78968de207 Merge pull request #4674 from Jarcolr/diction
Fixes #4621
2014-04-01 13:39:11 -05:00
Jarcolr
b33e9d0b92 Fixes #4621
Shogun forgotten in time.
2014-04-01 17:36:36 +03:00
Chinsky
26007716e4 Merge pull request #4660 from Jarcolr/patch-2
Can no longer use fire extinguisher closet without hands
2014-04-01 16:23:18 +04:00
Jarcolr
231ecb6890 Cannot wash your missing hands anymore
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
2014-03-31 21:13:26 +03:00
Jarcolr
cf42e348f0 Can no longer use fire extinguisher closet without hands
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
2014-03-31 18:19:25 +03:00
RavingManiac
b8e27c1347 Missing files added. 2014-03-30 21:51:20 +08:00
RavingManiac
7c75e591cd Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed. 2014-03-30 21:41:13 +08: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
dc773f9e49 Merge pull request #4644 from Glloyd/3dsound
3d Sound from /tg/
2014-03-29 11:00:55 -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
Graham Lloyd
b6f2d39f6b 3d Sound from /tg/ 2014-03-27 14:49:49 -04:00
Chinsky
d6bb03943b Merge pull request #4626 from Iamgoofball/chambox
Expanded on an old TG PR, Adds 9 new Chameleon items.
2014-03-26 02:12:59 +03: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
iamgoofball
6fa4084d11 Adds 9 new Chameleon items.
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
2014-03-23 14:08:23 -07:00
RKF45
aa08abed18 Fix 2014-03-22 19:06:45 +01:00
RKF45
5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01: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
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
5ed6e58430 Readded welder backpack. 2014-03-11 02:06:30 +04:00
Chinsky
0e08c90571 Merge branch 'dev-freeze' into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-10 19:05:24 +04:00
Chinsky
13b9747504 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-03-10 18:48:12 +04:00
Ccomp5950
46e1cfead7 Merge pull request #4551 from Furlucis/master
Removes an unnecessary check
2014-03-09 23:54:20 -05:00