bs12-bot
1f614c3149
Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light
...
Fixes runtime with yellow slime extracts.
2014-05-12 19:02:31 +01:00
Ravensdale
8e15a76da1
Fixes runtime with yellow slime extracts.
2014-05-12 01:15:45 -07:00
Loganbacca
f32d281132
Compressed matter implanter fix
...
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
Zuhayr
9f2f5fb488
Fixes #4808
2014-05-10 00:30:03 +09:30
Zuhayr
a1f6b7a211
Merge pull request #4885 from mwerezak/equipment-fixes
...
Misc Equipment fixes - Mostly hardsuits
2014-05-07 09:59:44 +09:30
Ccomp5950
3739ed03ff
Merge pull request #4905 from Jarcolr/properhudobject
...
Cyborg hud modules now have proper icon states
2014-05-04 09:36:32 -05:00
Jarcolr
e050251c81
Cyborg hud modules now have proper icons
...
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
2014-05-04 16:06:10 +03:00
Zuhayr
0e39f18763
Compile fix.
2014-05-03 23:17:08 +09:30
Zuhayr
5b32150858
Fixes for previous commit, sigh.
2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a
Adding some repair procs to cables and welders for IPC use.
2014-05-03 21:10:26 +09:30
Zuhayr
5ef994337b
Fix for previous commit.
2014-05-03 20:13:20 +09:30
Zuhayr
0dfe70fe2b
IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand.
2014-05-03 20:08:45 +09:30
Mike
946fd5329f
Fixed null flag for cigarette type
2014-05-02 15:59:47 -04:00
Ccomp5950
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Mloc
74ef3765d0
Merge pull request #4825 from DJSnapshot/hotfix
...
IPC fixes
2014-04-25 21:32:45 +01:00
DJSnapshot
a6fbde8f2f
Fixes for Mloc, part 2.
2014-04-25 13:31:10 -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
DJSnapshot
bd2b46078a
fix for https://github.com/Baystation12/Baystation12/issues/4548
2014-04-20 21:57:23 -07:00
DJSnapshot
13237e315f
Fix for https://github.com/Baystation12/Baystation12/issues/4512
2014-04-20 21:46:13 -07:00
Brian Cook
804e3f1a29
Update and clean up of all manuals
...
- Fixed typos
- Fixed grammar/punctuation
- Corrected out-of-date details
- Formatted to match font type and size of rest of the game
2014-04-20 16:09:57 -07:00
Mike
b24b39d267
Clean up check for item being equipped
...
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
2014-04-13 13:36:48 -04: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
Chinsky
06fd99b9ba
Merge pull request #4723 from Jarcolr/diction
...
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
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
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
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
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
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
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
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