cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,320 Commits 5 Branches 0 Tags
dad4430a55c7cb65b05c449497f383fb78b7f7e2
Commit Graph

9393 Commits

Author SHA1 Message Date
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
2989961542 Merge pull request #2729 from sick-trigger/master 
Fix to let monkeys throw right
 2013-05-02 05:14:37 -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
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
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
Asanadas
f2ce063eda Fixes a slip-up division thing. 2013-04-24 20:01:49 -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
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
SkyMarshal
bd0d988b23 Fix for Xenoarch machines producing ludicrous amounts of heat. 
Defines may need tweaked to produce the desired effect.
 2013-04-19 12:40:30 -07:00
Chinsky
51a2c09077 Merge pull request #2671 from SkyMarshal/master 
Fixed an issue with fire and volatile fuel, and reverted ShareSpace again since I hadn't completely reverted what Cael had done to that poor code.
 2013-04-18 04:45:29 -07:00
SkyMarshal
fee856c7d2 Fixes an issue with fire leaving the trace_gases list full of nulls and revert some more of whatever Cael had done to that poor air-movement procedure. 2013-04-17 22:46:34 -07:00
Albert Iordache
fdadc08414 Merge pull request #2670 from SkyMarshal/master 
Fixes lighting, Backpacks getting contaminated, and bombs not working.
 2013-04-17 22:15:10 -07:00
SkyMarshal
698e7af57c Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-17 22:07:41 -07:00
Ravensdale
313dc5e7c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/jobs/job/captain.dm
 2013-04-17 08:47:49 -07:00
Jim "Apples"
ba77890a98 Merge pull request #2667 from SkyMarshal/master 
Fix for lighting before roundstart.
 2013-04-17 06:41:11 -07:00
SkyMarshal
a7f569b74b Fix for lighting before roundstart. 2013-04-17 06:34:45 -07:00
Jim "Apples"
b3795db00e Merge pull request #2666 from SkyMarshal/master 
Loadsafixes.  See description. (Changelog updated retroactively)
 2013-04-17 02:10:01 -07:00
SkyMarshal
3456cbba35 Plasma no longer contaminates backpacks (They cannot be washed) 
Increased speed of zone equalization.
Lighting controller and ticker now initialized after world is set up and a player has joined.
 2013-04-17 01:51:18 -07:00
SkyMarshal
b3f13d4dca Airflow now prevents doors being bumped open. 
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
 2013-04-17 01:36:05 -07:00
SkyMarshal
8c39c0ffb0 Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them) 
Added in code to debug ZAS tile interactions, currently in the unchecked "Debug" file.
The blasted FloodFill proc now works properly, and zones are connecting right (Should finally fix that damn part of medbay not connecting to the hallway)
Plasma can contaminate again.
The master controller and world startup code has been reworked for faster server boots.
Fixed a runtime originating from a Away Mission map trying to create objects of type "null"
 2013-04-17 00:45:36 -07:00
Chinsky
b7732f251c Merge pull request #2662 from Asanadas/master 
Misc: Removing the captain's space suit armor on-spawn
 2013-04-16 16:15:16 -07:00
SkyMarshal
e8d7cc1e61 Fixes the bug with Filters allowing insane overpressurization. 2013-04-16 12:43:19 -07:00
Ravensdale
09212483bc final tweak for cap's PDA to do as advertised. 2013-04-16 08:47:23 -07:00
Ravensdale
19c7c8d651 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes. 
Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
 2013-04-16 08:43:19 -07:00
Asanadas
23817be957 Removing the captain spawning in with his space suit armor. 2013-04-15 17:44:06 -04:00
Chinsky
8761ba6bac Merge pull request #2656 from Jupotter/master 
FIx posibrain unable to be started
 2013-04-15 05:47:41 -07:00
Jupotter
614c01f238 Fix a wrong null check in posibrain 
A wrong nullcheck that prevent posibrain searching for a player
 2013-04-13 13:16:28 +03:00
Chinsky
3a0e432832 Merge pull request #2653 from Jupotter/master 
Fix for posibrain not turning off
 2013-04-13 02:20:16 -07:00
Jupotter
a8e1081d9d Add check forposibrain without brainmob 
This should never happen, but check nonetheless.
 2013-04-13 11:58:58 +03:00
Chinsky
73c17ceb80 Merge pull request #2652 from SkyMarshal/master 
Fire fixes and improvements.  Note: May need fine tuning.
 2013-04-13 01:03:31 -07:00
Ravensdale
9e33c868cf comments out suethecake's gun due to having a weapon's ban 2013-04-12 10:41:19 -07:00
jupotter
4836e9b057 Fix posibrain not turning off if no candidate 
The reset proc was checking for the presence of a brainmob, while one
was created in the constructor. It should rather check the presence of a
key
 2013-04-12 19:16:08 +02:00
SkyMarshal
c63dc0f962 Compile fix. 2013-04-11 12:19:35 -07:00
SkyMarshal
221901ba3a fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-11 12:14:47 -07:00