cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,760 Commits 5 Branches 0 Tags
59077c5b51ea74d74707779cad8dfa48813fe228
Commit Graph

454 Commits

Author SHA1 Message Date
Atlantiscze
59077c5b51 Buildable robot analyzers 
- Robot analyzers can now be built using Protolathe. They are low-mid level tech, requiring quite small research levels and no rare materials.
 2014-11-13 08:45:45 +01:00
Zuhayr
40e3ea33f6 Merge resolution. 2014-11-13 16:07:16 +10:30
Atlantiscze
64b6d6e27b Removes bluespace crystal RnD datum 
- Bluespace crystals were removed, but datum was left. Trying to build it causes runtime.
 2014-11-12 12:16:13 +01:00
Atlantiscze
d915fb2391 RnD Console Runtime Fix 
- This will mostly fix runtimes when items are removed and design datums are left behind.
- User now gets option to reset the console, and is told to submit bug report stating which item was being built.
- Also inserts warning into server log.
 2014-11-12 12:15:14 +01:00
PsiOmega
4ecc058150 Service personnel get their own radio frequency 
Bartenders, chefs, and janitors now have their own service frequency and corresponding headset.
The HoP is listening to this channel by default.
Creates a proper locker for the chef's extra gear.
 2014-11-07 20:54:57 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
8d509d9a6d Adds hand labeler to the Excavation tools closet. 2014-10-27 23:23:52 +01:00
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
Zuhayr
d278e496ee Fixes #6645 2014-10-11 06:58:44 +10:30
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
GinjaNinja32
2b16022ee0 Changes Alden-Saraspova counter behaviour to wait for new results before outputting 2014-10-01 22:32:45 +01:00
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Mloc
39781326cc fix for artifact teleportation effect 
will no longer teleport you inside random objects.

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 09:54:39 +01:00
Gamerofthegame
33b9d19df1 Commit repair 2014-09-28 17:13:42 -04:00
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr
8e9fc05b67 Fixes #6484 2014-09-25 18:36:25 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Atlantiscze
16fe060f1a Freezer Heater Board Fix 
- Freezer/Heater circuit boards now have proper build paths in Research
 2014-09-19 16:28:38 +02:00
PsiOmega
fe126626ac Cleans up radio frequency numbers. 
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
 2014-09-18 13:07:34 +02:00
Zuhayr
855586d111 Fixes empty genome lists when reconstituting fossils. 2014-09-18 13:37:16 +09:30
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Atlantiscze
c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
Ccomp5950
ed9850b373 Merge pull request #6258 from mwerezak/rddesigns 
Adds gas cooler/heater circuit designs
 2014-09-02 10:06:48 -05:00
Atlantiscze
8c983b317e SMES Board design fix 
- Fixes SMES circuit board issue
 2014-09-02 15:18:14 +02:00
mwerezak
0675c332a1 Adds cooler/heater circuit designs 2014-09-02 08:43:51 -04:00
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks 
Of Stacks
 2014-09-02 17:58:28 +09:30
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame 
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
 2014-09-01 18:31:26 -07:00
Zuhayr
53bee60a27 Merge resolution. 2014-09-02 09:18:20 +09:30
Whitellama
bdce104b6d Improved anomaly chat message cooldowns. 2014-08-31 17:51:13 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Whitellama
628f56ce42 Nerfed celldrain/charge to a limited range and stopped anomaly effects from spamming synthetics 2014-08-31 01:48:52 -07:00
Atlantiscze
641098fe78 SMES (de)construction: 
- Adds supply pack for SMES coil. Costs 75 points for single coil.
- Adds design for SMES circuitboard. Needs diamonds, gold, silver and is very high tech.
 2014-08-30 22:03:37 +02:00
Chinsky
f40298715f Merge pull request #6153 from PsiOmegaDelta/AtmosList 
Central Atmospherics Computer - Air alarm sub-list
 2014-08-26 15:25:59 +04:00
Chinsky
1c2cc138d6 Merge pull request #6168 from Kelenius/OfCablesAndStacks 
Cables are now stacks
 2014-08-26 15:25:31 +04:00
PsiOmega
2786c8e8b9 Remote air alarm control for the isolation cells now available on the outpost. 2014-08-25 23:24:35 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
d8b803d5e3 Fixes #6130 
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
 2014-08-23 10:20:24 +02:00
mwerezak
0345024f04 Removes telecomm and RD server temperature cap 2014-07-28 20:24:17 -04:00
mwerezak
5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
mwerezak
83d54af746 Adjusts power usage for R&D equipment 2014-07-27 03:36:28 -04:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Zuhayr
7fb8f30cc7 New machines, adjusted Cael's seeds, rewrote space vines. 2014-07-25 22:15:33 +09:30
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
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
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
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