cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 07:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 Commits

Author SHA1 Message Date
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
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
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
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
igalan
60fbe4b3be First commit for review: 
-ATMs no longer spawn spacecash when you Withdraw funds from them. Instead they spawn a charge card with the funds asked.
-You can swipe a charge card at an EFTPOS instead of your ID. The funds will be substracted from the charge card and won't ask for any PIN.
(ID card swiping is still available, of course)
-You can insert a change card in a vending machine. You can retrieve multiple products from the machine as long as the change card has enough funds to pay for them.

-Also, the EFTPOS instructions are rewritten into a simpler text. The text is not final.

Needed:
-A better name than "change card"? Also, until a name is set, variables are keeping the name "ewallet".
-An icon for the change card. For now it's using the 1000$ cash icon as placeholder.
 2014-04-17 01:48:06 +01: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
Brian Cook
5878cebb85 Fixed typo on Standard Operating Procedure paper 
Changed alrms to alarms
 2014-04-16 02:47:48 -07:00
Brian Cook
507fb71b99 Fixed typo in RD Readme 
Scalple corrected to Scalpel
 2014-04-16 02:41:54 -07:00
igalan
67fb9e510d -Ewallet can be extracted and inserted from and into ATMs. 
-Working with EFTPOS.

Todos:
-Vending machines.
-Proper icon.
-Proper name.
-Test.
 2014-04-15 07:41:54 +01:00
igalan
10e76d9762 E-Wallet object added. 
Made ATM to spawn e-wallets.

Untested.
 2014-04-15 05:27:23 +01:00
Chinsky
336a1c09ab Merge pull request #4753 from mwerezak/magboots-action-icon 
Magboots action icon
 2014-04-14 16:11:52 +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
iamgoofball
e7b4161011 Fixed chameleon bullets being able to embed. 2014-04-13 19:21:49 -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
Mike
dc6af64416 Prevent vox boots from enabling in player's hand 
Vox players can't "dig their claws into the flooring" when holding the
boots in their hand. When enabled, the boots can't be taken off until
disabled.
 2014-04-13 13:18:36 -04:00
Mike
55b7f7a283 Removed the now-redundant verb 
Less clutter for the object panel.
 2014-04-13 10:59:13 -04:00
Mike
d85d2ce1e4 Enabled action icon for magboots 2014-04-13 10:58:31 -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
SparklySheep
496645fc62 Churp 2014-04-11 12:21:28 -05:00
SparklySheep
d12f2570cd Nurp 2014-04-11 12:15:11 -05:00
SparklySheep
217c3f78a1 Derp 2014-04-11 12:04:16 -05:00
SparklySheep
21cc256945 Hurp 2014-04-11 12:01:33 -05: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
SparklySheep
c355a30cf6 Removes E-bow Instant Stun. Slight tox buff. 
The E-bow with the stun is currently the most powerful weapon in the game. Stuns on hit, causes immediate damage, unlimited ammo with recharge, and the stun is not affected by armor. You can viably stunlock someone to death just by occasionally shooting them without running out of ammo. Horrible design and it warrants an immediate removal until I finish my E-bow changes later.
 2014-04-10 14:41:37 -05: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
Ccomp5950
9fb43f2333 Merge pull request #4706 from DJSnapshot/papers 
Carbonless copy papers
 2014-04-07 02:12:10 -05:00