cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,090 Commits 8 Branches 0 Tags
25ddc19df46a7b42a57aa2940a14ea32fb47c93b
Commit Graph

473 Commits

Author SHA1 Message Date
PsiOmega
f3173bbbcf Merge remote-tracking branch 'upstream/dev' into Science! 2014-11-22 11:37:17 +01:00
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
PsiOmega
2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +01:00
PsiOmega
714a14776f Research Isolation Cells 
The research cells are now even more isolated.
 2014-11-20 16:53:17 +01:00
MagmaRam
72b0000f6a Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of. 2014-11-20 00:41:43 -05:00
MagmaRam
0eed2c2fa6 Fixes the xenoarch eguns. 
This was done by making the xenoarch eguns new subtypes with different update_icon() procs than the regular eguns. The new subtypes are in finds_eguns.dm
 2014-11-19 22:42:58 -05:00
MagmaRam
77c883cc6d Fixes missing icons for xenoarchaeology items EXCEPT for the energy guns. 2014-11-19 21:35:34 -05:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
PsiOmegaDelta
9b98d08d60 Merge pull request #7003 from mwerezak/window-fix 
Fixes #6702 and cleanup
 2014-11-18 08:15:47 +01:00
Zuhayr
b29f39b6f0 Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into spaceninjas 2014-11-16 13:43:17 +10:30
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
Zuhayr
579ebb84bb Added science rig, replaced CE rig. 2014-11-15 19:17:45 +10:30
PsiOmega
255b91553b Merge remote-tracking branch 'upstream/dev' into PAP 
Fixes #6844.
 2014-11-14 13:33:59 +01:00
Chinsky
0b8236da3b Merge pull request #7017 from PsiOmegaDelta/SafeResearch 
Research Safety
 2014-11-14 11:21:47 +03:00
Chinsky
1640b0a1c1 Merge pull request #7015 from Zuhayr/attackverbremoval 
Attack proc removal/refactor.
 2014-11-14 11:18:43 +03:00
PsiOmega
7bf33f98e4 Research Safety 
Research build paths are now type safe. ensuring the object type that is to be constructed always exists.
 2014-11-13 12:42:08 +01:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
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
mwerezak
ab2b4608e0 Fixes #6702 and cleanup 
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
 2014-11-12 20:09:04 -05:00
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