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

5258 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
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
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
6bd34da085 Fixes #2689. 2013-04-27 13:54:13 +04:00
Spamcat
e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04: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
SkyMarshal
698e7af57c Fixes lighting, backpacks getting contaminated, and bombs not working. 2013-04-17 22:07:41 -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
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
SkyMarshal
9176901c11 Napalm can now be made, due to fire changes. 2013-04-11 11:50:29 -07:00
SkyMarshal
b1e9955ea7 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. 2013-04-11 11:21:46 -07:00
Asanadas
778211d482 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. 2013-04-09 18:34:14 -04:00
SkyMarshal
7d114d22bd Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-09 00:49:19 -07:00
jupotter
12c7cfc88a Allow sec hud to add comment to sec record 
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the security record view from the
Security Hud
This list all the comments as on the security record computer
 2013-04-08 14:13:58 +02:00
jupotter
4b9d14b564 Allow medical hud to add comment to medical record 
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer

Add a [View comments log] link in the medical record view from the
Medical Hud
This list all the comments as on the medical record computer
 2013-04-08 14:12:57 +02:00
jupotter
bd52b3de32 Fix medical status change text from medical hud 2013-04-08 14:07:13 +02:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
e1604d08d8 No more ninja munching. 2013-04-03 20:54:00 +04:00
Spamcat
93e37a6a0c Fix for mouse emotes, courtesy of nan0desu. 
#2613
 2013-04-02 23:25:34 +04:00
Cael_Aislinn
2e0370ba65 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-02 21:14:13 +10:00
Cael_Aislinn
964525450d only hoverpods should make hissing noises when they move now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-02 20:16:47 +10:00
Spamcat
866a1c5feb Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-31 21:03:43 +04:00
Spamcat
dc2c87bc46 Fixed #2607 
and #2600 - in previous commit
 2013-03-31 14:26:44 +04:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-31 01:29:19 +10:00
Chinsky
fabb43d38a Merge pull request #2595 from Spamcat/BEF-staging 
BEF staging
 2013-03-29 06:18:51 -07:00
Spamcat
e424850568 Revert "Removed unneeded checks." 
This reverts commit 53b0a3f8c3.
*slaps himself* Don't touch what's working, chucklefuck.
 2013-03-29 14:51:57 +04:00