cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 20:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,644 Commits 8 Branches 26 Tags
5bc64c3db3b0cefcd449feebd80aee048ac669c9
Commit Graph

329 Commits

Author SHA1 Message Date
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping. 
fixes a minor oversight in proc order after i shuffled them around.
 2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix. 
sanitation of status display input was missing everywhere.
 2014-08-27 14:42:58 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix 
fixes #6005 and broken ancient human low/high pressure code.
 2014-08-19 05:54:30 -05:00
Whitellama
7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
 2014-08-17 17:50:07 -07:00
Whitellama
7539a6a5bb Added a JMP button to logs when someone adds something to a transfer valve. 2014-08-17 16:06:07 -07:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code. 
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
 2014-08-17 18:06:30 +02:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Hubblenaut
c80b921d6b Logs finishing tank transfer valve bombs and ghosting. Changes pAI request 
to state the name of the inquirer.
 2014-08-14 01:07:09 +02:00
GinjaNinja32
b4e6b4e204 Fixes not checking proximity argument 2014-08-13 09:41:38 +01:00
GinjaNinja32
7b7f526903 Fixes being able to use the floor painter through windows, windoors etc. 2014-08-13 09:30:11 +01:00
GinjaNinja32
9abd6765b1 More floor tiles 2014-08-12 21:13:46 +01:00
GinjaNinja32
0493090f15 Add more floor tile types 2014-08-12 21:09:51 +01:00
GinjaNinja32
dcd5092f23 Add floor painter 2014-08-12 20:47:26 +01:00
Chinsky
9f9865dac4 Merge pull request #5619 from mwerezak/power-net 
ATMOSPHERICS and Power Net Overhaul
 2014-08-08 09:49:42 +04:00
Atlantiscze
3627417c7b - Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions. 
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
 2014-08-04 09:25:53 +02:00
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
 2014-07-24 16:04:41 -04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
mwerezak
09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/game/machinery/recharger.dm
 2014-07-21 19:40:23 -04:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
mwerezak
789d3e4d54 Fixes modkits 
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
 2014-07-19 23:17:35 -04:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
mwerezak
c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
 2014-07-18 15:02:07 -04:00
Loganbacca
e05b5c0bfb Pipe rendering rewrite 
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
 2014-07-18 13:39:39 +00:00
Zuhayr
1345ee5a5c Initial commit for mobile pAIs. Almost guaranteed to be broken as shit. 2014-07-17 23:09:47 +09:30
mwerezak
5ca36fcadb Merge branch 'dev' into power-net 
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
 2014-07-16 16:14:52 -04:00
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Atlantiscze
db18074f90 Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard. 
AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again,
even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all
AI cores/intellicards/etc. This does not stop AI from using intercom, however.

 Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260
 2014-07-16 00:54:54 +02:00
Mloc
48cea3dbb3 Merge pull request #5578 from Faerdan/dev 
NanoUI Update
 2014-07-14 23:35:49 +01:00
Loganbacca
6b64fb5e77 Pipe rendering rewrite 
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
 2014-07-14 19:12:22 +12:00
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
Kelenius
aad89409de Slime update 2014-07-13 17:37:30 +04:00
Mark Aherne
6c12d62285 Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev 2014-07-11 10:53:08 +01:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
DJSnapshot
eacd384d39 Merge pull request #5554 from Baystation12/master 
Updating dev with master
 2014-07-09 23:00:04 -07:00
Jim the Cactus
c984385adb Merge branch 'master' of https://github.com/baystation12/baystation12 2014-07-09 14:53:16 -06:00
Mloc
c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master 
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
 2014-07-09 10:41:22 +01:00
John-Michael O'Brien
0e1d549ff1 Update PDA.dm 
Patched the comment to match the actual, final behavior (Doh!)
 2014-07-07 22:57:37 -06:00
Hubblenaut
6f1759a7aa Fixes me being dumb with renaming variables 2014-07-08 03:07:22 +02:00
Hubblenaut
38ac5ece7c Health Analyzer can read all types of beneficial medicine 2014-07-08 02:09:53 +02:00
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-07-06 17:50:53 +01:00
JimTheCactus
da6ff0a251 Patched PDA scanner to be more useful 
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
 2014-07-05 19:55:23 -06:00
mwerezak
e57419c725 Status displays now won't blank when undocking, too 2014-07-01 22:18:04 -04:00
mwerezak
8af5a234a0 Improves suit cooler 
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
 2014-06-29 19:10:00 -04:00
Chinsky
6393cb15d8 Merge pull request #5332 from mwerezak/wound-infections 
Gives the suit coolers a proper process() proc
 2014-06-24 05:32:47 +04:00
mwerezak
6b3c130702 Removes dynamic proc call 2014-06-23 10:55:03 -04:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30