cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,444 Commits 5 Branches 0 Tags
33917763dfa7035428d23ec6eb4f759cb1518910
Commit Graph

12968 Commits

Author SHA1 Message Date
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
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Ccomp5950
223aa25695 Merge pull request #4788 from RavingManiac/dev 
Breakable shuttle windows. Rearranged fitness.
 2014-04-21 22:00:01 -05: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
Jarcolr
51f8c4a530 Removes rogue , \ 's 
Why are you still here?
 2014-04-21 20:09:51 +03:00
Jarcolr
7734e69dda Quick fix 
Whoops.
 2014-04-21 19:50:19 +03:00
Jarcolr
80b4e0fa5b Adds "Harold's Cane" and "Farwa plush doll" 
Adds the defines and custom sprites for 2 approved custom items.

http://baystation12.net/forums/viewtopic.php?f=33&t=9960
http://baystation12.net/forums/viewtopic.php?f=33&t=9780
 2014-04-21 19:32:05 +03:00
igalan
7e8ff266a1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet 
Conflicts:
	icons/obj/items.dmi
 2014-04-21 06:07:02 +01: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
ee91b53dcc Added stationtime to ?status check in world/Topic() 2014-04-20 09:55:42 -05:00
RavingManiac
4fd01c2384 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1. 
Fitness room rearranged to make more sense, with glass around pool.
 2014-04-20 22:35:59 +08: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
RKF45
1cfd0c3342 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters 
Conflicts:
	code/game/objects/effects/decals/posters/bs12.dm
	icons/obj/contraband.dmi
 2014-04-19 19:24:45 +02:00
Chinsky
8777c8c071 Merge pull request #4765 from Jarcolr/devupdate 
New posters and sprites
 2014-04-19 21:10:51 +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
5fffe122dc Merge pull request #4776 from mwerezak/tac-armoury-beanbags 
Added beanbag shotguns to the tactical armoury
 2014-04-19 14:23:55 +04:00
Mike
2d7dca8eb5 Added beanbag shotguns to the tactical armoury 2014-04-18 20:28:53 -04:00
RKF45
2c839d4c09 Second and final batch 2014-04-18 21:28:27 +02:00
Chinsky
58430c03a7 Lets everyone delete AdminBot's notes. 
Fuck robot rights.
 2014-04-18 23:25:21 +04:00
RKF45
56689c887d First load of posters 2014-04-18 20:31:27 +02: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
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
igalan
fdb3d55483 -Printable transaction logs. 2014-04-18 05:42:25 +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
igalan
44c5fad3a0 -Added Malsquando's icon to items.dmi 
-Changed Reset transaction link to Back and made it to not ask for code if already paid.
 2014-04-18 03:00:44 +01:00
Mike
e76f431687 Adjusted fuel spread 
Made fuel stickier, so it spreads less thinly.
 2014-04-17 21:19:05 -04:00
Mike
9162ea03bb Fueltanks leak fuel when wrenched open 
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.
 2014-04-17 20:54:19 -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
Jarcolr
4bb17b8686 Let there be space 
woo
 2014-04-17 23:53:27 +03:00
Jarcolr
1e9e50b467 Space and space 
Woop.
 2014-04-17 15:39:44 +03:00
Jarcolr
b33b71649d New posters - Nienhaus 
These are new posters for more postery goodness. Credits for the sprites
go to Nienhaus.
For the sprites of the poster go to http://puu.sh/5QlUx.dmi
2 posters are not included: 6th and 7th due to reasons.
 2014-04-17 15:24:11 +03: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
Ccomp5950
daed8dd7ec Code for new bots allowing admins to PM Players via IRC and vice versa. 2014-04-16 23:14:17 -05: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