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
12,427 Commits 10 Branches 0 Tags
5b13445e9540532000aed2bc925014d3173fce35
Commit Graph

9456 Commits

Author SHA1 Message Date
SkyMarshal
7118add9da Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors. 2013-05-08 11:26:38 -07:00
Mloc-Argent
849ec5052a Fix for compiling on case sensitive filesystems. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:09:10 +01:00
Mloc-Argent
80e49b830e obligatory whoops! 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:02:26 +01:00
Mloc-Argent
0c820277c8 Merge branch 'master' of github.com:Baystation12/Baystation12 into emergency-bef 2013-05-06 15:45:09 +01:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Mloc
dad4430a55 Merge pull request #2739 from Aranclanos/ServerCrashFix 
Server crash fix.
 2013-05-06 04:38:08 -07:00
Aranclanos
7312807346 Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi 2013-05-05 21:21:09 -03:00
Aranclanos
d762024d68 Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop. 
Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver.
 2013-05-05 21:12:15 -03:00
Spamcat
f7f6c682cf Made nearsightedness not consume a fuckton of memory. 
Also it now adds glasses on preview pic.
 2013-05-03 23:58:56 +04:00
Spamcat
203873bef9 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-05-03 21:50:33 +04:00
Cael_Aislinn
bfdeeb4f94 resolved a MySQL statement issue 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:21:44 +10:00
Cael_Aislinn
29a3e93197 added safety checks for bad values in eftpos + atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:20:47 +10:00
sick-trigger
c6323eced1 Better monky throwing fix 
now, actually compiles! There seems to be a lot else wrong with monkey inventories but eh
 2013-05-03 04:46:21 +10:00
Mloc
b718bf5bf9 Makes change game mode votes in pre-game lobby delay the roundstart. Fixes #2686. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-02 14:07:11 +01:00
Mloc
2989961542 Merge pull request #2729 from sick-trigger/master 
Fix to let monkeys throw right
 2013-05-02 05:14:37 -07:00
fauxtada
cdb3466cd9 may or may not fix issue of missing sprite for captain's uniform jacket. 2013-05-02 03:19:23 -07:00
fauxtada
fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
sick-trigger
d44986542f Monkeys can now throw properly 2013-05-01 21:56:53 +10:00
MisterBook
bfee1a8cd5 Alters the pAI and AI crew manifest verb to display the fancier version, a la the ID Computer's Crew Manifest call. Also replaced a dirty, dirty looping List write with the far more elegant if call to data_core.get_manifest() 2013-04-30 23:57:49 -05:00
Spamcat
ef368a6756 Returned Lamarr. 
... which can be used as internals. Shh, let it be our secret...
#2583
 2013-04-30 16:59:38 +04:00
Spamcat
0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +04:00
fauxtada
e384c90093 minor changes 
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
 2013-04-30 02:37:43 -07:00
MisterBook
73997d7bd4 Fixes Godmode for humans so that it truly is godmode. Good for bug checking. Atmos temperature difference will no longer directly apply fireloss, nor will being punched or shot in the guts damage organs. Can no longer be shocked. 2013-04-29 22:35:58 -05:00
DarkTechnomancer
99503c5542 Imported the option to start nearsighted and give glasses to those who do. 2013-04-28 22:45:15 -04:00
jediluke69
9d83bd52b5 Added a shotgun shell ammo crate 2013-04-27 21:42:56 -04:00
jediluke69
a87a2abb37 Milkshakes and Rewriter should now have effects 2013-04-27 20:15:12 -04:00
jediluke69
e54b172a09 fixes my silly mistake on drink results... 2013-04-27 19:53:38 -04:00
Spamcat
b605fe84db Fixed #2706. 2013-04-27 14:37:10 +04:00
Spamcat
6bd34da085 Fixes #2689. 2013-04-27 13:54:13 +04:00
Spamcat
e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04:00
Cael_Aislinn
ba763477eb fixed shield generators not charging fields 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-26 21:46:36 +10:00
Chinsky
8ce8e35d02 Merge pull request #2704 from SkyMarshal/airfixes 
Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
 2013-04-25 11:02:14 -07:00
Chinsky
21ee07f82d Merge pull request #2707 from fauxki/bleeding-edge-freeze 
custom items update
 2013-04-25 11:00:33 -07:00
fauxtada
48a6326747 custom items update 
- Michael Guess' golden lighter
- Krinn's saucepan hat
- Writerer's cat thing
 2013-04-25 00:57:55 -07:00
Asanadas
f2ce063eda Fixes a slip-up division thing. 2013-04-24 20:01:49 -04:00
jediluke69
e256f2d095 should nerf nanopaste 2013-04-24 19:42:19 -04:00
SkyMarshal
3b41db4a18 Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery. 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-04-24 15:58:39 -07:00
jediluke69
85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00
Asanadas
ff229d5780 This 10x increases the size of admin-uploadable sound .ogg files and MIDI (10MB Midi, a scary thought). Should be big enough for any space assholes. Players can always opt out of uploaded music being downloaded and played with their "Hear/Silence-Midis" verb. 2013-04-24 17:55:14 -04:00
Asanadas
f03da6fb94 Spelling fix for a button only admins ever see. 2013-04-24 17:20:43 -04:00
fauxtada
c1991ba0dd Player Requests Edition 
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
 2013-04-24 03:04:35 -07:00
Chinsky
47b28e5cce Merge pull request #2690 from fauxki/bleeding-edge-freeze 
Bleeding edge freeze - Map / Clothing changes
 2013-04-23 16:15:05 -07:00
Chinsky
c8b800e6d9 Merge pull request #2695 from NerdyBoy1104/bleeding-edge-freeze 
Small Hydroponics update.
 2013-04-23 16:12:36 -07:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Mordeth221
3bff68a9a2 Fixed icon_state of sven-kit to sven_kit 2013-04-23 23:11:12 +02:00
Mordeth221
83719e09de Fixed a silly mistake 2013-04-23 21:37:40 +01:00
Mordeth221
76b2941803 Added custom APLU 2013-04-23 18:56:44 +01:00
fauxtada
272d7925cf Sorry, sorry! 
The last commit was full of compiling errors, this fixes that one.
 2013-04-22 13:29:23 -07:00
fauxtada
44a67167b3 Uniform Closet Changes 
- Adjusted the items that spawn in the mixed wardrobe. Now includes:
--- Colorful shoes.
--- Plaid Skirts. Lady Power.
--- Leather shoes.
- Put dispatcher uniform in security closet for playtesting purposes.
- Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff.
 2013-04-21 22:50:52 -07:00
SkyMarshal
0f570b5dc8 Same XenoArch computer fix as in master branch. 2013-04-19 16:34:50 -07:00