cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,847 Commits 7 Branches 0 Tags
3b67dabb17cbfa580b1856ce5571dce4e727c623
Commit Graph

12493 Commits

Author SHA1 Message Date
Ravensdale
3b67dabb17 Atmos mainline pipe code moved and enabled. 2014-04-28 09:08:38 -07:00
suethecake
3f9eff36fc Initial commit for Kaine's custom items. 2014-04-25 19:13:51 -06:00
Ccomp5950
b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans 
human: move organ generation into a species proc
 2014-04-25 15:33:34 -05:00
Chinsky
30823ef28f Merge pull request #4818 from mwerezak/beret-Von2531 
Custom item for Von2531/Jack Washington
 2014-04-24 21:27:11 +04:00
Mike
d76fb3b5c2 Custom item for Von2531: Jack Washington 2014-04-24 00:56:44 -07:00
Ccomp5950
f431f625a0 Merge pull request #4799 from Ravensdale/tratior 
Spelling correction: tratior and Tratior to traitor and Traitor
 2014-04-23 17:47:01 -05:00
Ccomp5950
9d9ad6bd1c Merge pull request #4792 from caelaislinn/shieldgens 
Shield generators update
 2014-04-23 17:46:47 -05:00
Cael Aislinn
976fb6520a misc tweaks and cleanups to shield gens/caps (renames, power usage), added a temp recharge delay when a field takes damage 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-04-23 08:48:21 +10:00
Cael Aislinn
a847a817c3 tweaks/expands shield gen supply packs 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-04-23 08:48:13 +10:00
Ccomp5950
166da096c3 Merge pull request #4794 from faerindel/changecard 
Adding change cards and a couple little changes.
 2014-04-22 17:39:04 -05:00
Ccomp5950
09ed42f793 Merge pull request #4795 from Jarcolr/customitems 
Adds 2 approved custom items and sprites to code
 2014-04-22 17:06:32 -05: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
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
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
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
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
RKF45
56689c887d First load of posters 2014-04-18 20:31:27 +02: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
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
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
20e2991af3 Merge pull request #4762 from mwerezak/holotable 
Fixes #4649
 2014-04-16 22:19:53 -05:00
Ccomp5950
bf37f177de Merge pull request #4761 from thelegendofbrian/test 
Fixed typos
 2014-04-16 22:19:15 -05:00
Ccomp5950
97397238f2 Merge pull request #4759 from Jarcolr/fix 
ID console max title length now 45 not 1024
 2014-04-16 22:16:39 -05: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
ece286f14a Fix for #4649 2014-04-16 16:49:40 -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
Brian Cook
4064e830e6 Fixed holodeck control computer typo 2014-04-16 00:50:53 -07:00
Jarcolr
e08e83b4b4 26 wasn't really enough ; 45 now 
I hope this will be enough.
 2014-04-15 22:37:17 +03:00
Jarcolr
cacdc67cc6 ID console title length now 26 not 1024 
If you go over the limit it just doesn't show the rest. Phah.
 2014-04-15 22:03:10 +03: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
0c10b63114 Merge pull request #4743 from Jarcolr/omega 
Adds 2 new groups to cargo console; tweaks
 2014-04-14 22:32:39 +04:00
Chinsky
106697a677 Merge pull request #4755 from Jarcolr/devupdate 
New IPC Faces - SparklySheep
 2014-04-14 16:14:45 +04:00
Chinsky
336a1c09ab Merge pull request #4753 from mwerezak/magboots-action-icon 
Magboots action icon
 2014-04-14 16:11:52 +04:00
Chinsky
99c4ef1544 Merge pull request #4745 from Jarcolr/issuefix 
Fixes #4721
 2014-04-14 16:04:54 +04:00