cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,856 Commits 10 Branches 0 Tags
ae206ac2e7a81e12e94cc1177e6ac81f718e4830
Commit Graph

12499 Commits

Author SHA1 Message Date
Chinsky
ae206ac2e7 Merge pull request #4844 from Mloc/bs12-nui 
turfs: fix some playsound ERRORs on areas
 2014-04-28 11:18:22 +04:00
Mloc-Argent
01e1153c00 turfs: fix some playsound ERRORs on areas 
Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-27 15:06:42 +01:00
Ccomp5950
0ef558cfa2 Paperbin fix, now doesn't silently fail if it has papers shoved into it. 2014-04-27 08:54:31 -05:00
DJSnapshot
7964e7b784 Merge pull request #4837 from Ccomp5950/dept_radio_fix 
Misc saycode fixes.
 2014-04-26 00:35:26 -07:00
Ccomp5950
fdab05baef ghosts won't see the random names given to announcement AI's 2014-04-26 02:29:41 -05:00
Ccomp5950
c985ecb02d Eavesdrop range on people talking into headsets is right next to them again. 
Distance dropped from 3 to 1
 2014-04-26 01:09:19 -05:00
Ccomp5950
2f2a308bfc Drunks will slur again. whoops. 2014-04-26 01:03:53 -05:00
Ccomp5950
5da8ce2cba Humans can use :h again for their departments. 2014-04-26 00:03:56 -05:00
DJSnapshot
185f325944 fix for paper bin runtime 2014-04-25 21:42:59 -07: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
Ccomp5950
e548fe6e43 Crash fix attempt: Moving NanoUI resource file sending away from client/New() 
it's going in mob/Login() instead.
 2014-04-25 17:47:27 -05:00
Mloc
74ef3765d0 Merge pull request #4825 from DJSnapshot/hotfix 
IPC fixes
 2014-04-25 21:32:45 +01:00
DJSnapshot
9dcea4f753 Merge pull request #4826 from DJSnapshot/dev-freeze 
Fixes to carbon copy paper.
 2014-04-25 13:32:16 -07:00
DJSnapshot
a6fbde8f2f Fixes for Mloc, part 2. 2014-04-25 13:31:10 -07:00
DJSnapshot
4236966e76 fixed what Mloc pointed out. 2014-04-25 13:14:01 -07:00
DJSnapshot
bbf7b31ccd Fixes to carbon copy paper. Basically merging it with regular paper bins. 2014-04-25 12:59:50 -07:00
Ccomp5950
2b9833ce0b Monkies / Dionaea nymphs should be able to emote again as well as not talk while dead. 
Removed debug msg from broadcaster.dm (oops)
 2014-04-25 03:15:14 -05:00
Ccomp5950
8ce78cd616 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into more-say-code-fixes 
Conflicts:
	code/modules/mob/hear_say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2014-04-25 03:04:59 -05:00
Ccomp5950
6a325036b0 Derpfix on Telecoms broadcast message, should fix any problem with arrivals computer having many names. 2014-04-25 03:00:54 -05: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
Ccomp5950
500fbdf99f Saycode fixes 2: Electric Boogaloo 
Binary channel now doesn't crop out the entire message when used.
Simple Animals won't talk while dead.
Poly/Parrots can use the radio and learn new phrases.
 2014-04-25 01:08:11 -05:00
Ccomp5950
79e9958c53 Merge pull request #4801 from thelegendofbrian/bucket 
Added bucket lid sprite and functionality
 2014-04-23 17:48:48 -05:00
Ccomp5950
910a65791a Merge pull request #4800 from Jarcolr/fix 
Adds sugar cane seeds to seed dispenser
 2014-04-23 17:47:53 -05:00
Ccomp5950
12e32c8159 Oops, compile fix on hear_say.dm 2014-04-23 17:40:42 -05:00
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
f56ddba067 Merge pull request #4791 from thelegendofbrian/manuals 
Update and clean up of all manuals
 2014-04-22 17:03:10 -05:00
Ccomp5950
dada7f1d96 Merge pull request #4767 from comma/master 
has_reagents baguette
 2014-04-22 17:02:03 -05:00
Jarcolr
ca6e12b607 Adds sugar cane seeds to seed vending machine 
This wasn't here: /obj/item/seeds/sugarcaneseed
 2014-04-22 11:58:49 +03:00
Brian Cook
182be1a8d3 Added bucket lid sprite and functionality 
Buckets can be lidded, however there is no change in the sprite when
this happens. This adds a lid and it's functional in game.
 2014-04-22 01:57:01 -07:00
Ccomp5950
7bc20f1d90 Merge pull request #4783 from mwerezak/open-space 
Fixes #4635
 2014-04-21 21:59:35 -05:00
Ccomp5950
4e1db5ea47 Merge pull request #4763 from mwerezak/actuator 
Fixes #4758
 2014-04-21 21:56:33 -05:00
DJSnapshot
bd2b46078a fix for https://github.com/Baystation12/Baystation12/issues/4548 2014-04-20 21:57:23 -07:00
DJSnapshot
fcdbda8383 fix for IPCs taking rad damage. 2014-04-20 21:57:12 -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
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
DJSnapshot
6082340077 super quick fix. Didn't realize my antag option thing would produce a null unclickable state. 2014-04-19 23:38:43 -07: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
Mike
ba97193bef Fixes #4635 2014-04-19 17:12:13 -04:00
Chinsky
34b0226b9e Merge pull request #4771 from Ccomp5950/broke_arm_fix 
Fixes the bug where people with broke arms don't drop what they are holding
 2014-04-19 21:09:19 +04:00
Chinsky
58430c03a7 Lets everyone delete AdminBot's notes. 
Fuck robot rights.
 2014-04-18 23:25:21 +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
Ccomp5950
fbfcb03788 Fixes the bug where people with broke arms don't drop what they are holding. 2014-04-18 04:53:22 -05: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
Chinsky
a2035bb69b Better check for toxins. 
Didn't realize class tree was so neat nao.
 2014-04-18 04:24:06 +04:00
Chinsky
a3e6e416dc has_reagent crackdown TROIX FUCK 
Got condition backwards, it was internal wounds don't grow bigger UNLESS they have bicard.
 2014-04-18 04:05:46 +04:00
Chinsky
35bf44cce5 has_reagent crackdown Deux 
Nothing fancy, I assume that get_amount is as bad as has_reagent, so might as well cut it.
 2014-04-18 03:55:32 +04:00
Chinsky
96a40af9d1 has_reagent crackdown Uno 
Moved check for toxins inside the loop checking for booze.
Instead of looping over reagents for EACH type of toxin.
 2014-04-18 03:43:23 +04:00
SkyMarshal
efcad9f527 Removal of Telescience. 2014-04-16 20:23:56 -07:00
Ccomp5950
20e2991af3 Merge pull request #4762 from mwerezak/holotable 
Fixes #4649
 2014-04-16 22:19:53 -05:00