cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 9 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 Commits

Author SHA1 Message Date
Walter0o
4ab79ca3d6 blocks hallucination on clientless mobs 
why bother calculating all those things for clientless mobs ?
 2014-07-19 23:00:42 +02:00
Walter0o
8ccce503a9 streamlining dreams 
no calling by clientless mobs, this should save several thousand wasted calls.
turning the massive string list that would be defined each call into a global list.
the chance the same dream gets picked twice is negletable.
 2014-07-19 23:00:20 +02:00
Mark Aherne
8dbf71a270 Update NanoUI Live Map. 
* Simplified how items are positioned on the map (e.g. ((value.x - 1) * 8) is now just value.x, scaling is applied later).
* Added four zoom levels (x1.0 to x2.5, triggered by links in the template).
* Moved the "Generate NanoUI Map" into the Server tab, to prevent it being used by admins accidentally.
 2014-07-19 11:02:46 +01:00
PsiOmega
eae1b01ca9 Adds support for the AI to store multiple camera locations, up to a given maximum 2014-07-19 11:25:00 +02:00
Zuhayr
ff556316a8 Merge pull request #5679 from mwerezak/wound-infections 
Removes organ_failure random event
 2014-07-19 12:32:50 +09:30
PsiOmega
73f8c30111 The AI may now store and return to a single position for its eye/camera view. 2014-07-19 02:58:16 +02:00
Mark Aherne
390fb696da Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-19 00:32:14 +01:00
Mark Aherne
f09b24ae17 Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map. 
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).
 2014-07-19 00:31:28 +01:00
Mloc-Hibernia
ccc73ddf69 modularize ban system 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-07-18 21:08:01 +00:00
mwerezak
ad211b19f7 Tweaks shotgun beanbag rounds 
Makes them more comparable to the shotgun stunshot.
 2014-07-18 16:03:54 -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
mwerezak
9825968880 Fixes lingering reference to organ_failure 2014-07-18 12:02:39 -04:00
mwerezak
9b71eb1fe6 Removes organ_failure random event 2014-07-18 11:40:49 -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
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
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
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
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
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
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
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
13b757938d Infections raise temperature faster wrt germ_level 2014-07-16 15:52:42 -04: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
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
Chinsky
4c4c248a72 Merge pull request #5623 from Decius-R/aeneas_labcoat_edit 
Changes labcoat sprite to be closed on custom item...
 2014-07-16 16:23:43 +04:00
Chinsky
61f8713941 Possible fix for #5645 
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
 2014-07-16 16:22:26 +04:00
Chinsky
5018330a5a Fixes #5650 
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
 2014-07-16 14:37:12 +04:00
Mark Aherne
75e2a703b0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 11:20:39 +01:00
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30