Commit Graph

14722 Commits

Author SHA1 Message Date
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
Hubblenaut
0da33d5161 Adds size_multiplier, icon_update vars and stops masks and shoes from rendering beneath hardsuits 2014-09-17 13:58:17 +02:00
RavingManiac
3bcaa1447c Fixed description error in cryo beakers.
Chem dispenser dispenses 40 units instead of 50 units so as to work well with 120-unit large beakers.
2014-09-17 00:51:33 +08:00
RavingManiac
d91d5aad0b Reagent overlays for bottles from the Chem Master.
Chemistry containers now have capacities in multiples of 60 (60 for bottles, pills and small beakers, 120 for large beakers and buckets) to make reactions more convenient.
2014-09-14 22:19:39 +08:00
Zuhayr
e7dc41d156 Merge pull request #6262 from atlantiscze/substation-multifix
[Done..?]Substation multifix MK I
2014-09-13 12:58:43 +09:30
Chinsky
9cc0ded4e0 Merge pull request #6319 from PsiOmegaDelta/IAmNinja
Ninjas can now phase jaunt.
2014-09-13 03:53:12 +04:00
Chinsky
2cf5af181f Merge pull request #6318 from PsiOmegaDelta/EyeOfTheNinja
Ninja-night vision now works.
2014-09-13 03:53:07 +04:00
Atlantiscze
c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
Atlantiscze
cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02:00
PsiOmega
3853782914 Ninjas can now phase jaunt.
Adds phase jaunt for a cost of 250 energy, compared to phase shift which costs 400E.
Randomly jumps the ninja 5-9 tiles straight ahead.
Cell use is now redacted directly in the ninjacost() proc.
Some cleanup of ninja verb-add/removal.
2014-09-11 15:02:42 +02:00
PsiOmega
34346cf308 Ninja-night vision now works.
A ninja now uses proper glasses instead of using its own hack.
Fixed a bug that would override the old ninja-night vision unless one also wore additional glasses in the glasses-inventory slot.
Adds overlays to thermals and mesons as well. Slightly reduces the intensity of the night vision overlay.
2014-09-11 13:43:13 +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
Chinsky
0167be6920 Merge pull request #6275 from RavingManiac/dev
NewPipe
2014-09-09 17:54:53 +04:00
Zuhayr
29e59ff456 Merge pull request #6289 from comma/overmap
Overmap
2014-09-08 11:21:37 +09:30
Zuhayr
b4a254fe36 Merge pull request #6296 from GinjaNinja32/multiz-fixes3
Multiz fixes and mapping features
2014-09-08 11:20:34 +09:30
Zuhayr
cfd5801172 Merge pull request #6295 from DeeUnderscore/grape-grinder
Add grape juicing to reagent grinder
2014-09-08 11:20:16 +09:30
Chinsky
9e5525ba43 Merge pull request #6284 from Kelenius/OfTilesAndTiming
Fixes floor tiles
2014-09-07 21:23:40 +04:00
D Anzorge
697d8d5b35 Add grape juicing to reagent grinder 2014-09-07 10:36:43 -04:00
GinjaNinja32
b9f596a126 Multiz fixes and mapping features take 3 2014-09-07 15:32:36 +01:00
SparklySheep
fda0070273 Update candle.dm 2014-09-06 15:06:55 -05:00
SparklySheep
81b7327bbb Increases how long the candle lasts.
Candle should last about ten times longer making it more useful as a light source.
2014-09-06 15:05:09 -05:00
Kelenius
b761ff5fcf Fixes floor tiles
Laugh.
2014-09-06 21:34:00 +04:00
Chinsky
91daf249ff Merge pull request #6278 from PsiOmegaDelta/StopRunningInTheShower
Wet shower floors
2014-09-06 05:43:17 +04:00
Chinsky
0f934f61c7 Merge pull request #6277 from PsiOmegaDelta/SayNoToUnderwear
Crew members are no longer cloned with clothes.
2014-09-06 05:43:10 +04:00
Zuhayr
2d06a04fac Merge pull request #6280 from PsiOmegaDelta/RoundEndFixes
Round-end feedback fix
2014-09-06 11:09:35 +09:30
RavingManiac
1f5ee94096 Supply/scrubber upward pipes, downward pipes and pipe caps added. 2014-09-06 01:22:03 +08:00
PsiOmega
497eae1877 Human (and sub-races) are no longer cloned with clothes. 2014-09-05 16:04:02 +02:00
PsiOmega
98bc0d5f60 Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback. 2014-09-05 11:00:47 +02:00
Atlantiscze
03f2be3091 PARTIAL IMPLEMENTATION - Charged SMES deconstruction & SMES code cleanup
- Cleanup of SMES attackby() code
- Buildable SMESs now have option to override safety circuit by using multitool while the hatch is open.
- Disabling safeties lets you disassemble SMES even if it's charged above 1%.
- If charge is above 5% stored energy may discharge violently. This is percentage based (more energy = higher chance of this occuring + more severe consequences)
- Larger discharges affect whole powernet, burning out some lights and even completely destroying APCs!
- Substation PSUs act as surge protection. Thus, if set up properly damage is limited to few areas which are directly on the main grid (= maintenance mostly)
- STILL NEEDS TESTING. Pushing so other people can review the code and give further suggestions. And because i need to access it on second computer.
2014-09-05 01:52:15 +02:00
RavingManiac
ac8562c7d9 Map altered to be NewPipe-compatible
Removed calls for non-existent files
2014-09-05 01:50:14 +08:00
RavingManiac
4f4bb49f45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-09-05 00:27:58 +08:00
RavingManiac
9801dfa9a9 NewPipe
-Supply and scrubber pipes can be run in parallel without connecting to each other
-Supply pipes will only connect to supply pipes, vents and Universal Pipe Adapters(UPAs)
-Scrubber pipes will only connect to scrubber pipes, scrubbers and UPAs
-Supply and scrubber pipes are offset along the x and y axes to prevent sprite overlap
-UPAs will connect to regular, scrubber and supply pipes, as well as anything else that connects to a regular pipe. UPAs will be used to interface between the supply/scrubber loops and atmos
2014-09-05 00:18:33 +08:00
PsiOmega
264504c595 Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor). 2014-09-04 16:36:26 +02:00
PsiOmega
4b4c2d11fa Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.
There is potential for breaking out all the special stuff for laser code but for now I'm happy to simply have a shared codebase.
I imagine pathfinding/patrolling may be sharable with bots in general as well.
2014-09-04 12:38:51 +02:00
Ccomp5950
7a228c9677 Merge pull request #6266 from PsiOmegaDelta/WhoYouGonnaCall
Sec/medical HUD users now receive relevant broadcasts
2014-09-04 04:16:55 -05:00
Ccomp5950
475074ed2f Merge pull request #6265 from PsiOmegaDelta/CryoBags
Limits body/cryo bags to a single mob.
2014-09-04 04:15:08 -05:00
PsiOmega
65bb6f8be1 Entities wearing sec/medical HUDs or corresponding now receive broadcast messages from relevant bots. 2014-09-03 18:50:46 +02:00
PsiOmega
e4bffb2d76 Limits body/cryo bags to a single mob. 2014-09-03 10:43:04 +02:00
Zuhayr
55ee64e764 Merge pull request #6211 from comma/tape
Tape now does not stop anything like magical wall it used to be.
2014-09-03 12:06:27 +09:30
Atlantiscze
20d33815ba Breaker Box Fix
- Removes source of runtime errors. From my examination of code, it seems these errors happen when breaker box is turned off for the first time. It should work then.
- Mostly temporary fix, i intend to rework the powernet code over time. I would welcome cooperation with @mwerezak as he is currently doing lots of related things.
2014-09-02 17:09:37 +02:00
Atlantiscze
3ca0d1577f Breaker Box AI interaction fix
- AI can now properly interact with Breaker Box, without interacting BOTH as AI and human.
2014-09-02 17:02:36 +02:00
Zuhayr
0344b33467 Merge pull request #6255 from PsiOmegaDelta/AreasStage2
Re-arranges Areas - Stage 2
2014-09-03 00:32:02 +09:30
Atlantiscze
6905a90b9e SMES Construction rework
- Buildable SMES is now subtype of regular SMES.
- Buildable SMES related stuff moved to separate file (smes_construction.dm)

Please note that this commit is one of two commits which have to be applied together. Otherwise, compilation error occurs. (Code + Map. This one is Code)
2014-09-02 15:33:36 +02:00
Atlantiscze
8c983b317e SMES Board design fix
- Fixes SMES circuit board issue
2014-09-02 15:18:14 +02:00
Atlantiscze
68dc63e005 SMES Coil Cost
- Supply point cost doubled to 150 according to feedback.
2014-09-02 15:15:47 +02:00
PsiOmega
dda1449404 Includes mwerezak's fore solar area changes. 2014-09-02 12:29:57 +02:00
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
PsiOmega
9cd5a1b1fe Maintenance Cleanup 2014-09-02 09:22:14 +02:00
Chinsky
367ddf6848 Merge pull request #6242 from PsiOmegaDelta/ExploitableAlternative
Antags - Exploitable Information - MKII
2014-09-02 11:18:50 +04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00