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
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

8480 Commits

Author SHA1 Message Date
Chinsky
3ab3f86239 Merge pull request #6875 from MagmaRam/dev 
Updated EVA and atmos manuals to match recent game changes.
 2014-10-30 00:10:59 +03:00
Graham Lloyd
d79c0285d4 fixes #5796 2014-10-29 17:03:17 -04:00
PsiOmega
bd08ee99b2 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-29 19:17:35 +01:00
PsiOmega
12d90332f9 Lobby menu refreshment 
If one was returned to the lobby after failing to acquire a job the lobby menu should now be refreshed, properly displaying Join Round/Observe instead of Declare Ready.
 2014-10-29 14:23:32 +01:00
PsiOmega
a1c19b78be Ports more of /tg/'s powernet code. 
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
 2014-10-29 14:01:35 +01:00
PsiOmega
9adb94ff55 Area-based Jukebox 
A jukebox which alters the ambient sound in the current area and plays it with 100% probability.
Leaving the area stops the ambient sound.
Entering the area resumes playing the ambient sound.
 2014-10-29 08:19:42 +01:00
PsiOmega
aa3e52b1be Adds sanity check for the mecha fire extingusher as well. Would rather remake it to be based on the standard extinguisher code but that's a dev project. 2014-10-29 08:07:36 +01:00
MagmaRam
b12674c18c Changed phrasing about pressure with full oxygen internals as suggested by mwerezak. 
Fixed typo pointed out by Glloyd.
 2014-10-29 01:49:28 -04:00
Chinsky
c8e27555b9 Merge pull request #6857 from mwerezak/hoverpod 
Hoverpod tweaks and mecha/working code cleanup
 2014-10-29 06:31:20 +03:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA 
PDA newscast reception
 2014-10-29 06:30:54 +03:00
Chinsky
8430dc0af0 Merge pull request #6858 from mwerezak/sleepers 
Sleepers now use power when synthesizing chemicals
 2014-10-29 06:30:21 +03:00
mwerezak
e549a22bba Removes world print, re-adds react() call 
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
 2014-10-28 22:13:42 -04:00
MagmaRam
04c3cb13d3 Updated EVA and atmos manuals to match recent game changes. 2014-10-28 17:10:56 -04:00
PsiOmega
e0796caf56 Fixes #6871. Fixes #6821. 
Amended to match the formatting in #6846, to hopefully avoid merge issues.
 2014-10-28 18:46:11 +01:00
PsiOmega
9c3121f739 Fixes #6864. 
Fix confirmed to not runtime and still causing sparks if a metallic object past through.
Agree with mwerezak that this being necessary is a bit bothersome.
 2014-10-28 18:35:12 +01:00
PsiOmega
9c41148a08 PDA newscaster 
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
 2014-10-28 17:10:35 +01:00
RavingManiac
2ecf93563c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-27 20:48:25 +08:00
PsiOmega
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01:00
PsiOmega
8232b01ba4 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-26 22:02:24 +01:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo 
Ports /tg/'s cable and powernet code
 2014-10-26 23:54:31 +03:00
Chinsky
95a4358931 Merge pull request #6849 from PsiOmegaDelta/Engineering 
Engineering Dorms Redux
 2014-10-26 23:48:52 +03:00
mwerezak
85fb8d917c Sleepers now use power when synthesizing chemicals 
Also, sleeper and chemmaster power usage are now both controlled by a
constant in setup.dm
 2014-10-26 15:10:37 -04:00
mwerezak
a2cf18174b Allows toggling hoverpod stabilization 2014-10-26 13:18:04 -04:00
mwerezak
cd1d457323 Factors out common mecha/working procs 
Refactors a bunch of identical hoverpod and ripley procs and moves them
into mecha/working
 2014-10-26 13:17:31 -04:00
mwerezak
4e7a8fac34 Hoverpod tweaks 
Hoverpods are a subtype of mecha/working again, but drills are now
ripley specific. Hoverpods have increased cargo and can carry 3 tools.
Hoverpod crates now come with a clamp and passenger compartment
pre-installed.
Brings back the combatpod, can equip weapons.
 2014-10-26 13:16:30 -04:00
Chinsky
44a01be13f Merge pull request #6856 from Baystation12/dev-freeze 
Freeze - Dev
 2014-10-26 09:41:07 +03:00
RavingManiac
27df7dca09 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-26 00:59:58 +08:00
RavingManiac
e0d48950b4 Doors can now be broken through damage. Broken doors can be crowbarred open. High-securiry doors automatically bolt themselves when broken. Doors which are damaged, but not broken, can be repaired with sheet metal. Broken doors must be reconstructed. Spark overlays for damaged and broken doors. 
Windows and doors will display messages indicating extant of damage as they are damaged (e.g. "Cracks begin to appear in [src]!")

Metal rods can substitute for crowbars to force unpowered and broken doors, as well as firelocks.

Window damage code cleaned up and centralized.
 2014-10-26 00:59:03 +08:00
PsiOmega
6a0f92e0e9 Engineering Dormitory redux 
Removes the engineering dormitory.
Replaces it with a washroom and a room with previously lost medical supplies (some gauze rolls and ointment) and some of the wardrobes from the now removes dormitory.
Adds more beds to the public dormitory area.
 2014-10-25 16:53:16 +02:00
Ravensdale
1a2353122f Bring back needed code 2014-10-24 20:12:30 -07:00
mwerezak
a0b47ce4de Water cools hot turfs even if they do not have a hotspot. 
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
 2014-10-24 21:45:02 -04:00
PsiOmega
0a7cbfa4cf Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-24 23:54:35 +02:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo 
Conflicts:
	code/modules/power/solar.dm
 2014-10-24 13:32:36 +02:00
Ravensdale
52b341f1a5 Removes excessively spammy admin log messages 2014-10-23 22:58:51 -07:00
PsiOmega
a49fd52732 Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions. 2014-10-24 07:23:48 +02:00
Zuhayr
f5d43128cc Merge pull request #6839 from Zuhayr/dev 
Dev
 2014-10-24 13:36:28 +10:30
Chinsky
cc77e130ef Merge pull request #6832 from PsiOmegaDelta/AIStatus 
AI emotions and status displays
 2014-10-24 04:33:49 +04:00
Zuhayr
7dcdfeb3a7 Merge pull request #6829 from PsiOmegaDelta/Mirrors 
Mirror Science
 2014-10-24 09:17:22 +10:30
Zuhayr
a5e11e208f Merge pull request #6823 from mwerezak/hoverpod 
Fixes #6820, #6822, adds ion trails to hoverpods.
 2014-10-24 09:16:44 +10:30
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
PsiOmega
9f8b6660fb Ports /tg/'s portable turrets. 
However, skipping porting /tg/'s projectile system for now. Not going to swallow more than I can chew here.
 2014-10-23 20:30:30 +02:00
PsiOmega
1bb1e87110 Moves down target assessment into machinery. 2014-10-23 14:37:06 +02:00
PsiOmega
687c2b40f7 Nabs /tg/ support procs and defines. 2014-10-23 14:35:34 +02:00
PsiOmega
85d7f3d9aa Moves /obj/machinery/turretid to its own class/file. 2014-10-23 13:40:53 +02:00
PsiOmega
d37647c291 AI emotions and status displays 
More centralized handling of AI status display emoticons, including handling of ckey-specific variants.
Breaks out the AI-specific implementation of status displays to its own file.
The AI can now also set individual statuses for its status screens by clicking them.
 2014-10-23 13:16:17 +02:00
mwerezak
a8a0d6f1cf Cleans up hovererpod move code, adds ion trails 
No need to duplicate the mecha move code when we're only interested in
drifting. The hoverpod also starts drifting when it runs out of power,
now.
 2014-10-23 00:25:18 -04:00
mwerezak
e8f3524b11 Fixes #6822 2014-10-22 21:56:43 -04:00
Chinsky
5633ed8c5a Merge pull request #6827 from Glloyd/pass 
Fixes effect/effect and Children Not Passing Over Tables/Through Grilles
 2014-10-23 05:35:40 +04:00
Graham Lloyd
1401877e01 silly me 2014-10-22 17:11:11 -04:00
PsiOmega
acd210cdc5 Mirror Science 
Future science to explain magic hair-corrective abilities.
 2014-10-22 22:53:50 +02:00