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
18,685 Commits 10 Branches 0 Tags
c46904a3b6bfae4b8088e930b870960ecf6a3a30
Commit Graph

13917 Commits

Author SHA1 Message Date
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
c4abe1f5d5 Pipe cleanup 
- Tidied up a couple of remaining pipes
- Removed overlapping pipes
- Removed step_x, step_y vars
 2014-07-18 13:43:08 +00:00
Loganbacca
fb6c928c4d Atmos update tweaks 
- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
 2014-07-18 13:41:59 +00: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
Mloc-Hibernia
51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
 2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
Mloc
ae9d75bd5e Merge pull request #5664 from Zuhayr/pais 
Mobile pAIs.
 2014-07-18 14:07:11 +01:00
Zuhayr
8e66bfe236 Moving lists from prior commit to a better place. 2014-07-18 22:29:07 +09:30
Zuhayr
ac62b0ec5c Moved pAI lists to globals. 2014-07-18 22:24:51 +09:30
Mloc
01c5025af6 Merge pull request #5672 from mwerezak/docking 
Docking controllers updates
 2014-07-18 12:58:11 +01:00
Mloc
6efff01110 Merge pull request #5671 from mwerezak/silicon-lang 
Removes Rootspeak from AI and robot languages
 2014-07-18 12:55:49 +01:00
Zuhayr
aad7db43ad Added a monkey sprite for pAIs. 2014-07-18 19:46:51 +09:30
Zuhayr
33bff18290 Removed a bit of redundant code, added pull check for mpAIs. 2014-07-18 19:15:48 +09:30
Zuhayr
9401dcf13c Fixes bug with drone Bump() check 
They can now use teleporters, hand tele portals and the disposals chute.
 2014-07-18 19:13:24 +09:30
mwerezak
7361c7da45 Loosens the undocking requirements for airlocks 2014-07-17 22:03:05 -04:00
mwerezak
3ea7e0ce3c Adds a name for the escape pod controller 2014-07-17 20:07:13 -04:00
mwerezak
21b2742086 Adds default values for some docking tags 
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.
 2014-07-17 20:01:20 -04:00
mwerezak
3209cb49a6 Removes Rootspeak from AI and robot languages 2014-07-17 19:30:00 -04:00
Zuhayr
3b20df66e5 Merge pull request #5622 from Faerdan/dev 
Layout update for NanoUI.
 2014-07-17 23:58:32 +09:30
Zuhayr
73d3883da3 Merge pull request #5652 from comma/master 
Couple xenoarch fixes
 2014-07-17 23:56:18 +09:30
Zuhayr
1f332bb1b0 Merge pull request #5654 from PsiOmegaDelta/StateLaws 
Allows the AI to select which channel to state laws on
 2014-07-17 23:56:07 +09:30
Zuhayr
63da854471 Merge pull request #5659 from mwerezak/op-hideout 
Maps the new op hideout into an asteroid base
 2014-07-17 23:56:00 +09:30
Zuhayr
55021687d2 Merge pull request #5661 from PsiOmegaDelta/Soap 
Deluxe soap now has a more pleasant range of smells.
 2014-07-17 23:55:51 +09:30
Zuhayr
3999c0bfb5 Fixed runtime with host bioscan, added verb cooldowns. 2014-07-17 23:31:12 +09:30
Zuhayr
1345ee5a5c Initial commit for mobile pAIs. Almost guaranteed to be broken as shit. 2014-07-17 23:09:47 +09:30
Mark Aherne
26e0c64801 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 13:48:52 +01:00
Chinsky
9e0569cfb9 Merge pull request #5631 from PsiOmegaDelta/Engine 
Remote-controlled emitters
 2014-07-17 15:42:03 +04:00
Chinsky
248affdebe Merge pull request #5656 from mwerezak/wound-infections 
Infection system tweaks
 2014-07-17 15:39:16 +04:00
Chinsky
e2e944dc66 Merge pull request #5655 from Walter0o/patch-2 
should fix #5618, trivial kitchen utensil bug
 2014-07-17 15:38:42 +04:00
Chinsky
543ab8acc3 Merge pull request #5653 from atlantiscze/tcomms-fix 
TComms heat fix + repairing
 2014-07-17 15:37:52 +04:00
Zuhayr
ea8cdb52c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:59:45 +09:30
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
PsiOmega
d2cdf01a60 Deluxe soap now has a more pleasant range of smells. 2014-07-17 12:54:51 +02:00
PsiOmega
dfcf25ce49 Allows the AI to state laws over the holopad. Modifies say-code to return true on success. 
Say-code updated to return true on success.
This allows for quitting early when stating laws without having to duplicating the checks made in the say-code.
 2014-07-17 12:43:41 +02:00
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
mwerezak
46533d299c Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net 2014-07-16 16:17:26 -04:00
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
mwerezak
1eee72d118 Updates body scanner readout for internal organs 2014-07-16 15:59:18 -04:00
mwerezak
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04:00
mwerezak
d6a070e6fc Improved full body scanner infection readout 
Now provides a higher level of precision on infection severity.
 2014-07-16 15:44:16 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Atlantiscze
bfe6d719f3 Adds Walter0o's suggestion 2014-07-16 17:32:53 +02:00
PsiOmega
7f16a35265 Adds the binary channel as a potential statement target. 2014-07-16 16:45:48 +02:00
PsiOmega
f8ff7a5510 Allows the AI to select which channel to state laws on. 2014-07-16 16:02:10 +02:00
Mloc
3d7fac2555 Merge pull request #5628 from Zuhayr/master 
Made Vox-Pidgin and Rootspeak untranslatable even by pAIs.
 2014-07-16 14:39:38 +01:00
Atlantiscze
4e588c6602 Better version, less copypaste code. 2014-07-16 15:25:30 +02:00
Walter0o
8baf6e4661 another missing battery check 2014-07-16 15:20:23 +02:00
Walter0o
9d3a87115a missing power check 
people could still use this without any charge
 2014-07-16 15:13:13 +02:00
atlantiscze
4f2b47e57b Update telecomunications.dm 
bad characters fix
 2014-07-16 15:11:16 +02:00